Добавлен инкремент и декремент

Author: aNNiMON

program.own

@@ -230,4 +230,5 @@ println x
 xarr = [0, 5, 2]
 xarr[0] += xarr[1]
 xarr[0] *= xarr[2]
-println xarr[0]
+xarr[0]++
+println xarr[0]

src/com/annimon/ownlang/parser/Lexer.java

@@ -60,6 +60,9 @@ public final class Lexer {
         OPERATORS.put(">>=", TokenType.GTGTEQ);
         OPERATORS.put(">>>=", TokenType.GTGTGTEQ);
 
+        OPERATORS.put("++", TokenType.PLUSPLUS);
+        OPERATORS.put("--", TokenType.MINUSMINUS);
+        
         OPERATORS.put("::", TokenType.COLONCOLON);
 
         OPERATORS.put("&&", TokenType.AMPAMP);

src/com/annimon/ownlang/parser/Parser.java

@@ -115,9 +115,9 @@ private Statement assignmentStatement() {
         if (match(TokenType.EXTRACT)) {
             return destructuringAssignment();
         }
-        final Expression assignment = assignmentStrict();
-        if (assignment != null) {
-            return new ExprStatement(assignment);
+        final Expression expression = expression();
+        if (expression instanceof Statement) {
+            return (Statement) expression;
         }
         throw new ParseException("Unknown statement: " + get(0));
     }
@@ -561,6 +561,12 @@ private Expression multiplicative() {
     }
 
     private Expression unary() {
+        if (match(TokenType.PLUSPLUS)) {
+            return new UnaryExpression(UnaryExpression.Operator.INCREMENT_PREFIX, primary());
+        }
+        if (match(TokenType.MINUSMINUS)) {
+            return new UnaryExpression(UnaryExpression.Operator.DECREMENT_PREFIX, primary());
+        }
         if (match(TokenType.MINUS)) {
             return new UnaryExpression(UnaryExpression.Operator.NEGATE, primary());
         }
@@ -610,6 +616,13 @@ private Expression variable() {
             if (lookMatch(0, TokenType.LPAREN)) {
                 return function(qualifiedNameExpr);
             }
+            // postfix increment/decrement
+            if (match(TokenType.PLUSPLUS)) {
+                return new UnaryExpression(UnaryExpression.Operator.INCREMENT_POSTFIX, qualifiedNameExpr);
+            }
+            if (match(TokenType.MINUSMINUS)) {
+                return new UnaryExpression(UnaryExpression.Operator.DECREMENT_POSTFIX, qualifiedNameExpr);
+            }
             return qualifiedNameExpr;
         }
 

src/com/annimon/ownlang/parser/TokenType.java

@@ -56,6 +56,9 @@ public enum TokenType {
     GTGTEQ, // >>=
     GTGTGTEQ, // >>>=
 
+    PLUSPLUS, // ++
+    MINUSMINUS, // --
+    
     LTLT, // <<
     GTGT, // >>
     GTGTGT, // >>>

src/com/annimon/ownlang/parser/ast/AssignmentExpression.java

@@ -6,7 +6,7 @@
  *
  * @author aNNiMON
  */
-public final class AssignmentExpression implements Expression {
+public final class AssignmentExpression implements Expression, Statement {
 
     public final Accessible target;
     public final BinaryExpression.Operator operation;
@@ -17,6 +17,11 @@ public AssignmentExpression(BinaryExpression.Operator operation, Accessible targ
         this.target = target;
         this.expression = expr;
     }
+    
+    @Override
+    public void execute() {
+        eval();
+    }
 
     @Override
     public Value eval() {

src/com/annimon/ownlang/parser/ast/FunctionalExpression.java

@@ -10,7 +10,7 @@
  *
  * @author aNNiMON
  */
-public final class FunctionalExpression implements Expression {
+public final class FunctionalExpression implements Expression, Statement {
 
     public final Expression functionExpr;
     public final List<Expression> arguments;
@@ -24,6 +24,11 @@ public void addArgument(Expression arg) {
         arguments.add(arg);
     }
 
+    @Override
+    public void execute() {
+        eval();
+    }
+    
     @Override
     public Value eval() {
         final int size = arguments.size();

src/com/annimon/ownlang/parser/ast/MatchExpression.java

@@ -13,7 +13,7 @@
  *
  * @author aNNiMON
  */
-public final class MatchExpression implements Expression {
+public final class MatchExpression implements Expression, Statement {
 
     public final Expression expression;
     public final List<Pattern> patterns;
@@ -23,6 +23,11 @@ public MatchExpression(Expression expression, List<Pattern> patterns) {
         this.patterns = patterns;
     }
 
+    @Override
+    public void execute() {
+        eval();
+    }
+    
     @Override
     public Value eval() {
         final Value value = expression.eval();

src/com/annimon/ownlang/parser/ast/UnaryExpression.java

@@ -8,9 +8,13 @@
  *
  * @author aNNiMON
  */
-public final class UnaryExpression implements Expression {
-    
+public final class UnaryExpression implements Expression, Statement {
+
     public static enum Operator {
+        INCREMENT_PREFIX("++"),
+        DECREMENT_PREFIX("--"),
+        INCREMENT_POSTFIX("++"),
+        DECREMENT_POSTFIX("--"),
         NEGATE("-"),
         // Boolean
         NOT("!"),
@@ -37,10 +41,41 @@ public UnaryExpression(Operator operation, Expression expr1) {
         this.expr1 = expr1;
     }
 
+    @Override
+    public void execute() {
+        eval();
+    }
+    
     @Override
     public Value eval() {
         final Value value = expr1.eval();
         switch (operation) {
+            case INCREMENT_PREFIX: {
+                if (expr1 instanceof Accessible) {
+                    return ((Accessible) expr1).set(new NumberValue(value.asNumber() + 1));
+                }
+                return new NumberValue(value.asNumber() + 1);
+            }
+            case DECREMENT_PREFIX: {
+                if (expr1 instanceof Accessible) {
+                    return ((Accessible) expr1).set(new NumberValue(value.asNumber() - 1));
+                }
+                return new NumberValue(value.asNumber() - 1);
+            }
+            case INCREMENT_POSTFIX: {
+                if (expr1 instanceof Accessible) {
+                    ((Accessible) expr1).set(new NumberValue(value.asNumber() + 1));
+                    return value;
+                }
+                return new NumberValue(value.asNumber() + 1);
+            }
+            case DECREMENT_POSTFIX: {
+                if (expr1 instanceof Accessible) {
+                    ((Accessible) expr1).set(new NumberValue(value.asNumber() - 1));
+                    return value;
+                }
+                return new NumberValue(value.asNumber() - 1);
+            }
             case NEGATE: return new NumberValue(-value.asNumber());
             case COMPLEMENT: return new NumberValue(~(int)value.asNumber());
             case NOT: return new NumberValue(value.asNumber() != 0 ? 0 : 1);