-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of https://github.com/cetio/fern
- Loading branch information
Showing
7 changed files
with
823 additions
and
186 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,47 +1,133 @@ | ||
| module parsing.treegen.expressionParser; | ||
|
|
||
| import tern.typecons.common : Nullable, nullable; | ||
| import parsing.treegen.astTypes; | ||
| import parsing.tokenizer.tokens; | ||
| import parsing.tokenizer.make_tokens; | ||
| import tern.typecons.common : Nullable; | ||
| import parsing.treegen.tokenRelationships; | ||
| import errors; | ||
| import std.stdio; | ||
| import std.container.array; | ||
|
|
||
| // Group letters.letters.letters into NamedUnit s | ||
| // Group Parenthesis into AstNode.Expression s to be parsed speratly | ||
| private AstNode[] phaseOne(Token[] tokens) | ||
| { | ||
| AstNode[] ret; | ||
| AstNode[] parenthesisStack; | ||
| bool isLastTokenWhite = false; | ||
| for (size_t index = 0; index < tokens.length; index++) | ||
| { | ||
| Token token = tokens[index]; | ||
| if (token.tokenVariety == TokenType.OpenBraces) | ||
| { | ||
| AstNode newExpression = new AstNode(); | ||
| newExpression.action = AstAction.Expression; | ||
| newExpression.expressionNodeData = ExpressionNodeData( | ||
| token.value[0], | ||
| braceOpenToBraceClose[token.value[0]], | ||
| [] | ||
| ); | ||
| parenthesisStack ~= newExpression; | ||
| continue; | ||
| } | ||
| if (token.tokenVariety == TokenType.CloseBraces) | ||
| { | ||
|
|
||
| if (parenthesisStack.length == 0) | ||
| throw new SyntaxError("Parenthesis closed but never opened"); | ||
|
|
||
| // Line types; | ||
| ///// 1. Variable declairation. | ||
| ///// NameUnit followed by NameUnit | ||
| AstNode node = parenthesisStack[$ - 1]; | ||
|
|
||
| enum LineType{ | ||
| Declaration, | ||
| Expression | ||
| } | ||
| if (node.expressionNodeData.closer != token.value[0]) | ||
| throw new SyntaxError("Parenthesis not closed with correct token"); | ||
|
|
||
| parenthesisStack.length--; | ||
|
|
||
| import std.stdio; | ||
| void parseLine(Token[] tokens, ScopeParsingMode mode) | ||
| { | ||
| size_t index = 0; | ||
| Nullable!Token firstToken = tokens.nextNonWhiteToken(index); | ||
| if (firstToken.ptr == null) | ||
| throw new SyntaxError("Expected a statement"); | ||
| // Nullable!LineType; | ||
| // Determine line type | ||
| if (mode.allowVariableDefinitions){ | ||
|
|
||
| if (parenthesisStack.length == 0) | ||
| ret ~= node; | ||
| else | ||
| parenthesisStack[$ - 1].expressionNodeData.components ~= node; | ||
| continue; | ||
| } | ||
| AstNode tokenToBeParsedLater = new AstNode(); | ||
| if (token.tokenVariety == TokenType.Letter){ | ||
| tokenToBeParsedLater.action = AstAction.NamedUnit; | ||
| tokenToBeParsedLater.namedUnit = tokens.genNameUnit(index); | ||
| index--; | ||
| }else if(token.tokenVariety == TokenType.Number){ | ||
| tokenToBeParsedLater.action = AstAction.LiteralUnit; | ||
| tokenToBeParsedLater.literalUnitCompenents = [token]; | ||
| } | ||
| else if(token.tokenVariety != TokenType.Comment){ | ||
| bool isWhite = token.tokenVariety == TokenType.WhiteSpace; | ||
| if (isWhite && isLastTokenWhite) continue; | ||
| isLastTokenWhite = isWhite; | ||
|
|
||
| tokenToBeParsedLater.action = AstAction.TokenHolder; | ||
| tokenToBeParsedLater.tokenBeingHeld = token; | ||
| } | ||
|
|
||
| if (parenthesisStack.length == 0) | ||
| ret ~= tokenToBeParsedLater; | ||
| else | ||
| parenthesisStack[$ - 1].expressionNodeData.components ~= tokenToBeParsedLater; | ||
| } | ||
| return ret; | ||
| } | ||
|
|
||
| private void operatorPairingPhase(Array!AstNode nodes){ | ||
|
|
||
| } | ||
|
|
||
|
|
||
| // Handle function calls and operators | ||
| private void phaseTwo(Array!AstNode nodes){ | ||
| for (size_t index = 0; index < nodes.length; index++){ | ||
| AstNode node = nodes[index]; | ||
| if (node.action == AstAction.NamedUnit && index+1 < nodes.length && nodes[index+1].action == AstAction.Expression){ | ||
| AstNode functionCall = new AstNode(); | ||
| AstNode args = nodes[index+1]; | ||
|
|
||
| Array!AstNode components; | ||
| components~=args.expressionNodeData.components; | ||
| phaseTwo(components); | ||
| scanAndMergeOperators(components); | ||
| args.expressionNodeData.components.length = components.data.length; | ||
| args.expressionNodeData.components[0..$] = components.data[0..$]; | ||
|
|
||
|
|
||
| functionCall.action = AstAction.Call; | ||
| functionCall.callNodeData = CallNodeData( | ||
| node.namedUnit, | ||
| args | ||
| ); | ||
| nodes[index] = functionCall; | ||
| nodes.linearRemove(nodes[index+1..index+2]); | ||
| } | ||
| else if (node.action == AstAction.Expression){ | ||
| Array!AstNode components; | ||
| components~=node.expressionNodeData.components; | ||
| phaseTwo(components); | ||
| scanAndMergeOperators(components); | ||
| node.expressionNodeData.components.length = components.data.length; | ||
| node.expressionNodeData.components[0..$] = components.data[0..$]; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| import parsing.treegen.treeGenUtils; | ||
|
|
||
| import parsing.treegen.tokenRelationships; | ||
| unittest | ||
| { | ||
| parseLine(tokenizeText("int x = 4;"), ScopeParsingMode( | ||
| false, | ||
| false, | ||
| true, | ||
| true, | ||
| false, | ||
| false | ||
| )); | ||
|
|
||
| import parsing.tokenizer.make_tokens; | ||
| AstNode[] phaseOneNodes = phaseOne("math.sqrt(3*5+6*7/2)*3".tokenizeText); | ||
|
|
||
| Array!AstNode nodes; | ||
| nodes~=phaseOneNodes; | ||
| phaseTwo(nodes); | ||
| scanAndMergeOperators(nodes); | ||
| nodes[0].tree(0); | ||
|
|
||
| } |
Oops, something went wrong.