Skip to content
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

Jump to bottom

LG/Expression parity with C# (till Nov 25) #1453

Merged
merged 10 commits into from
Dec 2, 2019
Merged

LG/Expression parity with C# (till Nov 25) #1453

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e044d2e
init
Danieladu Nov 26, 2019
9606228
finisn expression sync
Danieladu Nov 27, 2019
3dd2322
init lg
Danieladu Nov 27, 2019
efa0564
forward
Danieladu Nov 27, 2019
227a293
fix test errors
Danieladu Nov 28, 2019
e4d14ee
forward
Danieladu Nov 28, 2019
3826505
Merge branch 'master' into hond/migrate
Danieladu Nov 28, 2019
25bd150
rename test file
Danieladu Nov 28, 2019
7ce09c4
fix comments
Danieladu Nov 28, 2019
03d0066
refine
Danieladu Dec 2, 2019
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
47 changes: 30 additions & 17 deletions libraries/botbuilder-lg/src/LGFileLexer.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ fragment U: 'u' | 'U';
fragment W: 'w' | 'W';

fragment STRING_LITERAL : ('\'' (~['\r\n])* '\'') | ('"' (~["\r\n])* '"');
fragment EXPRESSION_FRAGMENT : '@' '{' (STRING_LITERAL| ~[\r\n{}'"] )*? '}';
fragment ESCAPE_CHARACTER_FRAGMENT : '\\' ~[\r\n]?;

COMMENTS
: ('>'|'$') ~('\r'|'\n')+ NEWLINE? -> skip
Expand All @@ -60,6 +62,7 @@ DASH
LEFT_SQUARE_BRACKET
: '[' -> pushMode(STRUCTURED_TEMPLATE_BODY_MODE)
;

RIGHT_SQUARE_BRACKET
: ']'
;
Expand Down Expand Up @@ -121,6 +124,10 @@ WS_IN_BODY
: WHITESPACE+ -> type(WS)
;

MULTILINE_PREFIX
: '```' -> pushMode(MULTILINE)
;

NEWLINE_IN_BODY
: '\r'? '\n' {this.ignoreWS = true;} -> type(NEWLINE), popMode
;
Expand All @@ -146,31 +153,19 @@ CASE
;

DEFAULT
: D E F A U L T WHITESPACE* ':' {this.expectKeywords}? {this.ignoreWS = true;}
;

MULTI_LINE_TEXT
: '```' .*? '```' { this.ignoreWS = false; this.expectKeywords = false;}
: D E F A U L T WHITESPACE* ':' {this.expectKeywords}? { this.ignoreWS = true;}
;

ESCAPE_CHARACTER
: '\\{' | '\\[' | '\\\\' | '\\'[rtn\]}] { this.ignoreWS = false; this.expectKeywords = false;}
: ESCAPE_CHARACTER_FRAGMENT { this.ignoreWS = false; this.expectKeywords = false;}
;

EXPRESSION
: '@'? '{' (~[\r\n{}'"] | STRING_LITERAL)*? '}' { this.ignoreWS = false; this.expectKeywords = false;}
;

TEMPLATE_REF
: '[' (~[\r\n[\]] | TEMPLATE_REF)* ']' { this.ignoreWS = false; this.expectKeywords = false;}
;

TEXT_SEPARATOR
: [\t\r\n{}[\]()] { this.ignoreWS = false; this.expectKeywords = false;}
: EXPRESSION_FRAGMENT { this.ignoreWS = false; this.expectKeywords = false;}
;

TEXT
: ~[\t\r\n{}[\]()]+? { this.ignoreWS = false; this.expectKeywords = false;}
: ~[\r\n]+? { this.ignoreWS = false; this.expectKeywords = false;}
;

mode STRUCTURED_TEMPLATE_BODY_MODE;
Expand All @@ -190,7 +185,25 @@ STRUCTURED_NEWLINE
STRUCTURED_TEMPLATE_BODY_END
: WS_IN_STRUCTURED? RIGHT_SQUARE_BRACKET WS_IN_STRUCTURED? -> popMode
;

STRUCTURED_CONTENT
: ~[\r\n]+
;

mode MULTILINE;

MULTILINE_SUFFIX
: '```' -> popMode
;

MULTILINE_ESCAPE_CHARACTER
: ESCAPE_CHARACTER_FRAGMENT -> type(ESCAPE_CHARACTER)
;

MULTILINE_EXPRESSION
: EXPRESSION_FRAGMENT -> type(EXPRESSION)
;

MULTILINE_TEXT
: (('\r'? '\n') | ~[\r\n])+? -> type(TEXT)
;
13 changes: 6 additions & 7 deletions libraries/botbuilder-lg/src/LGFileParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
parser grammar LGFileParser;

options { tokenVocab=LGFileLexer; }

file
Expand Down Expand Up @@ -41,11 +40,11 @@ parameters
;

templateBody
: normalTemplateBody #normalBody
| ifElseTemplateBody #ifElseBody
: normalTemplateBody #normalBody
| ifElseTemplateBody #ifElseBody
| switchCaseTemplateBody #switchCaseBody
| structuredTemplateBody #structuredBody
;
;

structuredTemplateBody
: structuredBodyNameLine structuredBodyContentLine? structuredBodyEndLine
Expand Down Expand Up @@ -73,12 +72,12 @@ templateString
;

normalTemplateString
: DASH (WS|TEXT|EXPRESSION|TEMPLATE_REF|TEXT_SEPARATOR|MULTI_LINE_TEXT|ESCAPE_CHARACTER)*
: DASH (WS|TEXT|EXPRESSION|ESCAPE_CHARACTER|MULTILINE_SUFFIX|MULTILINE_PREFIX)*
;

errorTemplateString
: INVALID_TOKEN_DEFAULT_MODE+
;
: INVALID_TOKEN_DEFAULT_MODE+
;

ifElseTemplateBody
: ifConditionRule+
Expand Down
Loading