Skip to content

recovered old design of new template syntax #2754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jurgenvinju wants to merge 2 commits into
base: main
Choose a base branch
from
Open

recovered old design of new template syntax #2754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3a06aae
recovered old design of new template syntax
jurgenvinju Apr 13, 2026
bfdca0c
merged another unmerged branch into the grammar
jurgenvinju Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .settings/org.eclipse.jdt.core.prefs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.lambda.genericSignature=do not generate
org.eclipse.jdt.core.compiler.codegen.methodParameters=generate
org.eclipse.jdt.core.compiler.codegen.shareCommonFinallyBlocks=disabled
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -168,8 +168,8 @@ org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=warning
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=warning
org.eclipse.jdt.core.compiler.processAnnotations=disabled
org.eclipse.jdt.core.compiler.release=enabled
org.eclipse.jdt.core.compiler.source=11
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.storeAnnotations=disabled
org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
org.eclipse.jdt.core.compiler.taskPriorities=NORMAL,HIGH,NORMAL
Expand Down
81 changes: 40 additions & 41 deletions src/org/rascalmpl/library/lang/rascal/syntax/Rascal.rsc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,42 @@ syntax Literal
syntax Expression = concrete: Concrete concrete;
syntax Pattern = concrete: Concrete concrete;

layout NoLayout = @Manual ();

syntax StringLiteral
= \default: "\"" NoLayout Indentation indent NoLayout {StringPart NoLayout}* body NoLayout "\"";

syntax StringPart
= \var : "$" NoLayout QualifiedName variable
| \expr : "$(" Expression result KeywordArguments[Expression] keywordArguments ")"
| \block : "${" Statement+ statements "}"
| \ifThenD : "$if" "(" {Expression ","}+ conditions ")" "{" NoLayout {StringPart NoLayout}* body NoLayout "}"
| \ifThenElseD : "$if" "(" {Expression ","}+ conditions ")" "{" NoLayout {StringPart NoLayout}* body NoLayout "}" "else" "{" NoLayout {StringPart NoLayout}* elseBody NoLayout "}"
| \whileD : "$while" "(" {Expression ","}+ conditions ")" "{" NoLayout {StringPart NoLayout}* body NoLayout "}"
| \forD : "$for" "(" {Expression ","}+ conditions ")" "{" NoLayout {StringPart NoLayout}* body NoLayout "}" // any first and final literal body part are dropped at the start and end
| balancedCurlies: "{" NoLayout {StringPart NoLayout}* body NoLayout "}"
| \margin : "\n" NoLayout Indentation margin NoLayout "\'" NoLayout Indentation indent
| \characters : StringCharacters characters
| @deprecate \compatible : StringPartOld old
;

// "$for (e <- elems) {$e, }"

syntax StringPartOld
= \hole : "\<" Expression arg "\>"+
| \ifThen : "\<" "if" "(" {Expression ","}+ conditions ")" "{" Statement* preStats "\>" NoLayout {StringPart NoLayout}* body NoLayout "\<" Statement* postStats "}" "\>"
| \ifThenElse: "\<" "if" "(" {Expression ","}+ conditions ")" "{" Statement* preStatsThen "\>" NoLayout {StringPart NoLayout}* body NoLayout "\<" Statement* postStatsThen "}"
"else" "{" Statement* preStatsElse "\>" NoLayout {StringPart NoLayout}* elseBody NoLayout "\<" Statement* postStatsElse "}" "\>"
| \for : "\<" "for" "(" {Expression ","}+ generators ")" "{" Statement* preStats "\>" NoLayout {StringPart NoLayout}* body NoLayout "\<" Statement* postStats "}" "\>"
| \doWhile : "\<" "do" "{" Statement* preStats "\>" NoLayout {StringPart NoLayout}* body NoLayout "\<" Statement* postStats "}" "while" "(" Expression condition ")" "\>"
| \while : "\<" "while" "(" Expression condition ")" "{" Statement* preStats "\>" NoLayout {StringPart NoLayout}* body NoLayout "\<" Statement* postStats"}" "\>"
;

lexical StringCharacters = @category="Constant" StringCharacter+ chars !>> ![\" \' \< \> \n ~];
lexical Indentation
= [\ \t \u00A0 \u1680 \u2000-\u200A \u202F \u205F \u3000]* !>> [\ \t \u00A0 \u1680 \u2000-\u200A \u202F \u205F \u3000]
;

lexical Concrete
= typed: "(" LAYOUTLIST l1 Sym symbol LAYOUTLIST l2 ")" LAYOUTLIST l3 "`" ConcretePart* parts "`";

Expand Down Expand Up @@ -300,16 +336,6 @@ syntax ProtocolPart
= nonInterpolated: ProtocolChars protocolChars
| interpolated: PreProtocolChars pre Expression expression ProtocolTail tail ;

syntax StringTemplate
= ifThen : "if" "(" {Expression ","}+ conditions ")" "{" Statement* preStats StringMiddle body Statement* postStats "}"
| ifThenElse: "if" "(" {Expression ","}+ conditions ")" "{" Statement* preStatsThen StringMiddle thenString Statement* postStatsThen "}" "else" "{" Statement* preStatsElse StringMiddle elseString Statement* postStatsElse "}"
| \for : "for" "(" {Expression ","}+ generators ")" "{" Statement* preStats StringMiddle body Statement* postStats "}"
| doWhile : "do" "{" Statement* preStats StringMiddle body Statement* postStats "}" "while" "(" Expression condition ")"
| \while : "while" "(" Expression condition ")" "{" Statement* preStats StringMiddle body Statement* postStats "}" ;

lexical PreStringChars
= @category="string" [\"] StringCharacter* [\<] ;

lexical CaseInsensitiveStringConstant
= @category="string" "\'" StringCharacter* chars "\'" ;

Expand Down Expand Up @@ -372,11 +398,6 @@ syntax Assignable
| \tuple : "\<" {Assignable ","}+ elements "\>"
| annotation : Assignable receiver "@" Name annotation ;

lexical StringConstant
= @category="string" "\"" StringCharacter* chars "\"" ;



syntax Assoc
= associative: "assoc"
| left: "left"
Expand All @@ -392,20 +413,16 @@ syntax DataTarget
| labeled: Name label ":" ;

lexical StringCharacter
= "\\" [\" \' \< \> \\ b f n r t]
= "\\" [$ { } \" \' \< \> \\ b f n r t]
| UnicodeEscape
| ![\" \' \< \> \\]
| [\n][\ \t \u00A0 \u1680 \u2000-\u200A \u202F \u205F \u3000]* [\'] // margin
| ![$ { } \" \' \< \> \\]
;

lexical JustTime
= "$T" TimePartNoTZ !>> [+\-] "$"
| "$T" TimePartNoTZ TimeZonePart "$"
;

lexical MidStringChars
= @category="string" [\>] StringCharacter* [\<] ;

lexical ProtocolChars
= [|] URLChars "://" !>> [\t-\n \r \ \u00A0 \u1680 \u2000-\u200A \u202F \u205F \u3000];

Expand Down Expand Up @@ -499,11 +516,6 @@ lexical OptionalTerminator
| present: ";"
;

syntax StringMiddle
= mid: MidStringChars mid
| template: MidStringChars mid StringTemplate template StringMiddle tail
| interpolated: MidStringChars mid Expression expression StringMiddle tail ;

syntax QualifiedName
= \default: {Name "::"}+ names !>> "::" ;

Expand All @@ -519,11 +531,6 @@ lexical DecimalIntegerLiteral
syntax DataTypeSelector
= selector: QualifiedName sort "." Name production ;

syntax StringTail
= midInterpolated: MidStringChars mid Expression expression StringTail tail
| post: PostStringChars post
| midTemplate: MidStringChars mid StringTemplate template StringTail tail ;

syntax PatternWithAction
= replacing: Pattern pattern "=\>" Replacement replacement
| arbitrary: Pattern pattern ":" Statement statement ;
Expand Down Expand Up @@ -581,11 +588,6 @@ syntax Visibility
| \default:
| \public: "public" ;

syntax StringLiteral
= template: PreStringChars pre StringTemplate template StringTail tail
| interpolated: PreStringChars pre Expression expression StringTail tail
| nonInterpolated: StringConstant constant ;

lexical Comment
= @category="comment" "/*" (![*] | [*] !>> [/])* "*/"
| @category="comment" "//" ![\n]* !>> [\ \t\r \u00A0 \u1680 \u2000-\u200A \u202F \u205F \u3000] $ // the restriction helps with parsing speed
Expand Down Expand Up @@ -802,9 +804,6 @@ syntax ProdModifier
syntax Toplevel
= givenVisibility: Declaration declaration ;

lexical PostStringChars
= @category="string" [\>] StringCharacter* [\"] ;

lexical HexIntegerLiteral
= [0] [X x] [0-9 A-F a-f]+ !>> [0-9 A-Z _ a-z] ;

Expand Down Expand Up @@ -837,8 +836,8 @@ syntax BasicType
;

lexical Char
= @category="string" "\\" [\ \" \' \- \< \> \[ \\ \] b f n r t]
| @category="string" ![\ \" \' \- \< \> \[ \\ \]]
= @category="string" "\\" [{ } \ \" \' \- \< \> \[ \\ \] b f n r t]
| @category="string" ![{ } \ \" \' \- \< \> \[ \\ \]]
| @category="string" UnicodeEscape
;

Expand Down
Loading