Allow Serialization and Deserialization of DSL from and to String by Entenwilli · Pull Request #231 · DataFlowAnalysis/DataFlowAnalysis

Entenwilli · 2024-12-09T13:07:12Z

This PR implements a serializer and deserializer for the analysis DSL. It includes the following:

Serialization of DSL elements from a string
Comprehensive error messages for parser results
Deserialization of DSL elements to a string

This PR progresses toward closing issue #225. The next step is an update to the WebEditor to allow the input of constraints there

01Parzival10

LGTM

Entenwilli · 2024-12-11T10:48:32Z

This PR is now ready for the first proper, in-depth reviews.
Some work is still ongoing, for example the extraction of common code and useful utilities

…from string

…String

…from string

…to vertex types

…ctly

…parsed, instead fail over

Entenwilli · 2025-01-13T10:33:30Z

This PR is now ready again!
I've implemented multiple parameterized tests for each part of the DSL to ensure it is working

sebinside

I propose to add more JavaDoc (I marked some of the locations). One could argue, that the fromString functions (and related stuff) is only called in this one use case internally, coming from the web editor. However, it could happen in the future that other extensions use this methods, so they should be documented properly (of course, using copy/paste to a high degree).

...g.dataflowanalysis.analysis.dfd/src/org/dataflowanalysis/analysis/dfd/dsl/DFDVertexType.java

...g.dataflowanalysis.analysis.pcm/src/org/dataflowanalysis/analysis/pcm/dsl/PCMVertexType.java

.../org.dataflowanalysis.analysis/src/org/dataflowanalysis/analysis/dsl/AnalysisConstraint.java

...rg.dataflowanalysis.analysis/src/org/dataflowanalysis/analysis/dsl/ConditionalSelectors.java

...org.dataflowanalysis.analysis/src/org/dataflowanalysis/analysis/dsl/DataSourceSelectors.java

...les/org.dataflowanalysis.analysis/src/org/dataflowanalysis/analysis/dsl/SourceSelectors.java

.../org.dataflowanalysis.analysis/src/org/dataflowanalysis/analysis/dsl/context/DSLContext.java

...is.analysis/src/org/dataflowanalysis/analysis/dsl/selectors/CharacteristicsSelectorData.java

...is.analysis/src/org/dataflowanalysis/analysis/dsl/selectors/DataCharacteristicsSelector.java

...is.analysis/src/org/dataflowanalysis/analysis/dsl/selectors/VariableConditionalSelector.java

...sis.analysis/src/org/dataflowanalysis/analysis/dsl/variable/ConstraintVariableReference.java

…the DSL

Nicolas-Boltz

LGTM

Sebastian looks good to me

Allow Serialization and Deserialization of DSL from and to String

Entenwilli added enhancement New feature or request research Investigation or reserach related issue core Related to the core DFD/PCM data flow analysis support Related to supporting projects which are neither core analysis or meta model bundels editor Related to the web editor labels Dec 9, 2024

Entenwilli added this to the 4.0.0 milestone Dec 9, 2024

Entenwilli requested review from 01Parzival10, BenjaminArp, Nicolas-Boltz, sebinside and uuqjz December 9, 2024 13:07

Entenwilli self-assigned this Dec 9, 2024

01Parzival10 previously approved these changes Dec 9, 2024

View reviewed changes

Entenwilli dismissed 01Parzival10’s stale review via 2ea9480 December 11, 2024 10:39

Entenwilli added 5 commits December 11, 2024 11:42

feat(dsl-serialization): add initial implementation of serialization

6c11ed4

feat(dsl-serialization): finish serialization to String

7c58920

feat(dsl): implement recursive parser for DSL expressions

a4b786f

fix(dsl): do not require conditional selectors for parsing

e9a2f26

feat(dsl): implement parsing for vertex characteristics selector

9c7d446

Entenwilli force-pushed the dsl-serialization branch from 2ea9480 to 9c7d446 Compare December 11, 2024 10:42

Entenwilli marked this pull request as ready for review December 11, 2024 10:48

Tom Hüller and others added 8 commits December 19, 2024 17:59

Fix: Wrong selector created in NodeDestinationSelectors when parsing …

9108f33

…from string

refactor(dsl): change keyword of vertex characteristics selector

47f9dd4

feat(dsl): implement parsing of DataCharacteristicList selector from …

bec1b94

…String

feat(dsl): implement first version of parsing a vertex type selector …

24fb4f1

…from string

feat(dsl): provide interface for downstream implementations to parse …

4d12b68

…to vertex types

feat(dfd-dsl): implement dsl context provider for dfd

cb9f93f

feat(pcm-dsl): implement dsl context provider for pcm

eee45f4

fix(core): export package containing classes for DSL

0ef4e5a

Entenwilli added 9 commits January 13, 2025 11:02

test(dsl-core): implement tests for dsl destination selectors

9b6317f

test(dsl-core): implement tests for data source selectors

f093b29

test(dsl-core): implement tests for conditional selectors

f65d220

fix(dsl-core): consume tokens in data characteristics selectors corre…

ddc56fc

…ctly

fix(dsl-core): forbid "!" in varable names

91a478d

fix(dsl-core): do not throw error in selectors when tokens cannot be …

1d6a2ea

…parsed, instead fail over

test(dsl-core): for Selectors fail if not all tokens were consumed

7c8f28d

test(dsl-core): test whether variable names with "!" are not permitted

536f7ac

test(dsl-core): fix expected string for example dsl constraint

347f20b

Entenwilli requested a review from 01Parzival10 January 13, 2025 10:32

sebinside previously requested changes Jan 15, 2025

View reviewed changes

sebinside removed request for 01Parzival10, BenjaminArp and uuqjz January 21, 2025 12:19

fix(dsl): fix visibility one parseSourceSelector

baebd1e

Nicolas-Boltz requested changes Jan 27, 2025

View reviewed changes

Entenwilli added 3 commits February 3, 2025 11:34

refactor(dsl): unify common symbols into abstract superclass

4af89ab

docs(dsl): add JavaDoc for high-level parsing methods and classes of …

745e3a1

…the DSL

docs(utils): document StringView and ParseResult

8757094

Entenwilli requested review from 01Parzival10, Nicolas-Boltz and sebinside February 3, 2025 11:38

Nicolas-Boltz approved these changes Feb 4, 2025

View reviewed changes

Nicolas-Boltz merged commit 275121f into main Feb 4, 2025
1 check passed

Nicolas-Boltz deleted the dsl-serialization branch February 4, 2025 12:12

Entenwilli pushed a commit that referenced this pull request Mar 30, 2025

Merge pull request #231 from DataFlowAnalysis/dsl-serialization

d3aa1a4

Allow Serialization and Deserialization of DSL from and to String

Entenwilli pushed a commit that referenced this pull request Mar 30, 2025

Merge pull request #231 from DataFlowAnalysis/dsl-serialization

1e5b03d

Allow Serialization and Deserialization of DSL from and to String

Entenwilli pushed a commit that referenced this pull request May 2, 2025

Merge pull request #231 from DataFlowAnalysis/dsl-serialization

7ee9d56

Allow Serialization and Deserialization of DSL from and to String

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Allow Serialization and Deserialization of DSL from and to String#231

Allow Serialization and Deserialization of DSL from and to String#231
Nicolas-Boltz merged 39 commits intomainfrom
dsl-serialization

Entenwilli commented Dec 9, 2024 •

edited

Loading

Uh oh!

01Parzival10 left a comment

Uh oh!

Entenwilli commented Dec 11, 2024

Uh oh!

Entenwilli commented Jan 13, 2025

Uh oh!

sebinside left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Nicolas-Boltz left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

Entenwilli commented Dec 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

01Parzival10 left a comment

Choose a reason for hiding this comment

Uh oh!

Entenwilli commented Dec 11, 2024

Uh oh!

Entenwilli commented Jan 13, 2025

Uh oh!

sebinside left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Nicolas-Boltz left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Entenwilli commented Dec 9, 2024 •

edited

Loading