diff --git a/didactic-chainsaw-dsl/src/language/js-transform-lang.langium b/didactic-chainsaw-dsl/src/language/js-transform-lang.langium index 95089ed..71cd962 100644 --- a/didactic-chainsaw-dsl/src/language/js-transform-lang.langium +++ b/didactic-chainsaw-dsl/src/language/js-transform-lang.langium @@ -1,19 +1,18 @@ grammar JsTransformLang -terminal PROPOSALNAME: /[(][_a-zA-Z][\w]*[)]/; +terminal PROPOSALNAME: /[_a-zA-Z]+/; terminal STRING: /"(\\.|[^"\\])*"|'(\\.|[^'\\])*'/; entry Model: (proposals+=Proposal); Proposal: - "proposal" proposalName=PROPOSALNAME "{" + "proposal" "(" proposalName=PROPOSALNAME ")" "{" "applicable" "to" "{" code=STRING "}" "replace" "with" "{" code=STRING "}" - "}" -; + "}"; diff --git a/dsl_files/test.jstl b/dsl_files/test.jstl index 2f161fe..3d20c5e 100644 --- a/dsl_files/test.jstl +++ b/dsl_files/test.jstl @@ -1,7 +1,3 @@ - - - - proposal (async) { applicable to { let _$_a_$_ = await _$_expr_$_();