Implement Advanced DSL by Entenwilli · Pull Request #385 · DataFlowAnalysis/DataFlowAnalysis

Entenwilli · 2026-03-30T10:10:42Z

This PR implements the advanced DSL with the syntax we discussed:

Multiple Flow Types: neverFlows, flows, alwaysFlows and notAlwaysFlows
Additional Selectors: any, vertex name and data name
Additional matching functionality: Support for contains for names

The new prefix for instances of the DSL is *

Examples

* test1: data A.B neverFlows data C.D

Data C.D from any TFG does not flow to a vertex that also has data A.B

* test2: vertex A.B neverFlows vertex C.D"

Any flow from a vertex with label A.B to a vertex with label C.D does not exists

* test3: data A.B flows vertex C.D

Data A.B must flow to a vertex C.D in at least one TFG

* test4: data A.B alwaysFlows vertex C.D

Data A.B must flow to a vertex C.D in all TFGs

* test5: data A.B notAlwaysFlows vertex C.D

Data A.B must not flow to a vertex C.D in at least one TFG

* test6: data A.B neverFlows vertex any
* test7: data A.B neverFlows data any

Any selectors always match

* test8: data name contains Test neverFlows vertex C.D
* test9: data name Test neverFlows vertex C.D
* test10: data A.B neverFlows vertex name Test
* test11: data A.B neverFlows vertex name contains Test

Names of data and names can be matched exactly or via contains

* test12: data A.B and data C.D neverFlows vertex C.D
* test13: data A.B neverFlows (vertex C.D or vertex E.F) and data G.H

Boolean operations and braces are supported via and, or and xor as well as not for negation

For Testing

Test with the online editor and its backend by replacing line 138 in Converter.java in the backend with

StringView string = new StringView("* " + it.name() + ": " + it.constraint().replace("\n ", ""));

… keyword

…rtices

BenjaminArp · 2026-04-07T05:49:58Z

+    }
+
+    public static ParseResult<DestinationSelectors> fromString(StringView string, DSLContext context) {
+        string.skipWhitespace();


the string.skipWhitespace() gets called 5 times in a row without the string changing is this corect/intended?

BenjaminArp · 2026-04-07T05:52:38Z

 public final class SourceSelectors extends AbstractParseable {
-    private final Optional<DataSourceSelectors> dataSourceSelectors;
-    private final Optional<VertexSourceSelectors> vertexSourceSelectors;
+    private final DataSourceSelectors dataSourceSelectors;


this now requires the dsl to specify both data and vertex Selectors? so smth like data neverflows vertex internal !logging is no longer allowed?

BenjaminArp · 2026-04-07T05:59:33Z

+    private static final String DSL_OPERATOR = "&&";
+
+    private final AbstractSelector lhs;
+    private final AbstractSelector rhs;


Don´t use acronyms, lefthandside and righthandside?

BenjaminArp · 2026-04-07T06:00:55Z

+        if (string.startsWith(DSL_OPERATOR)) {
+            return string.expect(DSL_OPERATOR);
+        }
+        string.skipWhitespace();


same skipWhitespace as above, i belive the first call in fromString is skip whitespace

BenjaminArp · 2026-04-07T06:05:36Z

+        if (string.empty() || string.invalid()) {
+            return ParseResult.error("Not a valid constraint");
+        }
+        string.skipWhitespace();


repetive skipWhitespace, i will not comment every occurence of this

BenjaminArp · 2026-04-07T06:15:43Z

-        return this.inverted ? DSL_INVERTED_SYMBOL + DSL_KEYWORD + " " + this.name : DSL_KEYWORD + " " + this.name;
+        StringBuilder stringBuilder = new StringBuilder();
+        if (this.inverted)
+            stringBuilder.append(DSL_INVERTED_SYMBOL + " ");


Add brackets to if (maybe we want to add this to the formatter)

BenjaminArp · 2026-04-07T06:17:03Z

+    }
+
+    public AdvancedAnalysisConstraint(String name,
+            org.dataflowanalysis.analysis.dsl.groups.SourceSelectors sourceSelectors, FlowType flowType,


why don´t use the "simple" type instead of the complete declaration?

BenjaminArp · 2026-04-07T06:19:26Z

-        this.dataSourceSelectors = new DataSourceSelectors();
-        this.vertexDestinationSelectors = new VertexDestinationSelectors();
-        this.conditionalSelectors = new ConditionalSelectors();
+        this.sourceSelectors = new org.dataflowanalysis.analysis.dsl.groups.SourceSelectors();


Why do you use the complete type?

BenjaminArp · 2026-04-07T06:26:59Z

+
+    public SimpleAnalysisConstraint(String name,
+            org.dataflowanalysis.analysis.dsl.groups.SourceSelectors sourceSelectors,
+            DestinationSelectors destinationSelectors,


complete type

feat(dsl): implement parsing for advanced DSL

7878c5e

Entenwilli added this to the 5.1.0 milestone Mar 30, 2026

Entenwilli requested review from 01Parzival10, BenjaminArp, Kr0nox, Lostlias, Nicolas-Boltz, manuelcorcoles and uuqjz March 30, 2026 10:10

Entenwilli self-assigned this Mar 30, 2026

Entenwilli added enhancement New feature or request core Related to the core DFD/PCM data flow analysis editor Related to the web editor labels Mar 30, 2026

Entenwilli added 8 commits March 31, 2026 12:12

refactor(dsl): move selector groups to own package

fd1da6a

test(dsl): expand vertex name selector test for contains operator

021c299

style(formatter): change maximum line length to 120

800a4d5

test(dsl): expand tests for variable name selector for added contains…

6e4aa5f

… keyword

fix(dsl): add groups package to exported package in core

9c57b2c

feat(core): track previously encountered vertex characteristics in ve…

56c9eea

…rtices

feat(dsl): change keyword of vertexName and dataName to just name

3094981

feat(dsl): add syntax constructs for logical operators

9420d5c

BenjaminArp reviewed Apr 7, 2026

View reviewed changes

Entenwilli added 5 commits April 14, 2026 12:52

feat(dsl): add draft implementation for logical operators

2314578

feat(dsl): implement advanced DSL evaluation logic

c4939c9

feat(dsl): implement first working version for inter-tfg constraints

f0eb8f4

feat(dsl): implement evaluation of flows,alwaysFlows,notAlwaysFlows

c8a2e8c

feat(dsl): implement variable updates for or and xor logical operators

2e57b4a

Entenwilli marked this pull request as ready for review June 2, 2026 11:11

Entenwilli removed request for Lostlias and manuelcorcoles June 3, 2026 12:07

Entenwilli linked an issue Jun 24, 2026 that may be closed by this pull request

Allow analysis of cross transpose flow graph streams in DSL #179

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Implement Advanced DSL#385

Implement Advanced DSL#385
Entenwilli wants to merge 14 commits into
mainfrom
dsl-extension

Entenwilli commented Mar 30, 2026 •

edited

Loading

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

BenjaminArp Apr 7, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Uh oh!

Conversation

Entenwilli commented Mar 30, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Examples

For Testing

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Entenwilli commented Mar 30, 2026 •

edited

Loading