|
1 | | -using OwnLang.ast.lib; |
| 1 | +using OwnLang.ast.lib; |
2 | 2 | using System; |
3 | 3 | using System.Collections.Generic; |
4 | 4 | using System.Linq; |
@@ -188,7 +188,8 @@ private Statement enums() |
188 | 188 | match(TokenType.COMMA); |
189 | 189 | enums.Add(en, new StringValue(en)); |
190 | 190 | } |
191 | | - Variables.set(name, new EnumValue(enums)); |
| 191 | + //Variables.set(name, new EnumValue(enums)); |
| 192 | + //return new NanStatement(); |
192 | 193 | return new AssignmentStatement(name, new ValueExpression(new EnumValue(enums))); |
193 | 194 | } |
194 | 195 |
|
@@ -763,7 +764,7 @@ private Expression primary() |
763 | 764 | { |
764 | 765 | return ldef(); |
765 | 766 | } |
766 | | - if(lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.DDOT)) |
| 767 | + if(lookMatch(0, TokenType.WORD) && lookMatch(1, TokenType.DDOT)) |
767 | 768 | { |
768 | 769 | return ddot(); |
769 | 770 | } |
@@ -893,10 +894,15 @@ private LambdaExpression lambda() |
893 | 894 |
|
894 | 895 | private DdotExpression ddot() |
895 | 896 | { |
896 | | - string name = consume(TokenType.WORD).getText(); |
| 897 | + //new ValueExpression(); |
| 898 | + |
| 899 | + string value = consume(TokenType.WORD).getText(); |
897 | 900 | consume(TokenType.DDOT); |
898 | | - StringValue value = new StringValue(consume(TokenType.WORD).getText()); |
899 | | - DdotExpression ddot = new DdotExpression(name, value); |
| 901 | + //string name = consume(TokenType.WORD).getText(); |
| 902 | + //StringValue name = new StringValue(consume(TokenType.WORD).getText());string value = consume(TokenType.WORD).getText(); |
| 903 | + string name = consume(TokenType.WORD).getText(); |
| 904 | + |
| 905 | + DdotExpression ddot = new DdotExpression(value, name); |
900 | 906 | return ddot; |
901 | 907 | } |
902 | 908 |
|
@@ -931,6 +937,7 @@ private FunctionalExpression function() |
931 | 937 | } |
932 | 938 | return efunction; |
933 | 939 | } |
| 940 | + |
934 | 941 | consume(TokenType.LPAREN); |
935 | 942 | FunctionalExpression function = new FunctionalExpression(name); |
936 | 943 | while (!match(TokenType.RPAREN)) |
|
0 commit comments