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

[PORT]Loose grammar to make Structure LG more torren #1976

Merged
merged 2 commits into from
Apr 2, 2020
Merged

[PORT]Loose grammar to make Structure LG more torren #1976

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcc9193
Loose grammar to make Structure LG more torren
Danieladu Apr 2, 2020
5b63120
Merge branch 'master' into hond/fix
cosmicshuai Apr 2, 2020
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
4 changes: 2 additions & 2 deletions libraries/adaptive-expressions/src/parser/expressionParser.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ export class ExpressionParser implements ExpressionParserInterface {
return new Constant(numberValue);
}

throw Error(`${ context.text } is not a number.`);
throw new Error(`${ context.text } is not a number.`);
}

public visitParenthesisExp = (context: ep.ParenthesisExpContext): Expression => this.visit(context.expression());
Expand Down Expand Up @@ -183,7 +183,7 @@ export class ExpressionParser implements ExpressionParserInterface {

private readonly makeExpression = (functionType: string, ...children: Expression[]): Expression => {
if (!this._lookupFunction(functionType)) {
throw Error(`${ functionType } does not have an evaluator, it's not a built-in function or a custom function.`);
throw new Error(`${ functionType } does not have an evaluator, it's not a built-in function or a custom function.`);
}

return Expression.makeExpression(functionType, this._lookupFunction(functionType), ...children);
Expand Down
3 changes: 1 addition & 2 deletions libraries/botbuilder-lg/src/LGFileParser.g4
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ templateBody
;

structuredTemplateBody
: structuredBodyNameLine ((structuredBodyContentLine STRUCTURED_NEWLINE)+)? structuredBodyEndLine?
: structuredBodyNameLine (((structuredBodyContentLine? STRUCTURED_NEWLINE) | errorStructureLine)+)? structuredBodyEndLine?
;

structuredBodyNameLine
Expand All @@ -60,7 +60,6 @@ errorStructuredName
structuredBodyContentLine
: keyValueStructureLine
| objectStructureLine
| errorStructureLine
;

errorStructureLine
Expand Down
Loading