http://git-wip-us.apache.org/repos/asf/metron/blob/3df94987/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/generated/StellarParser.java
----------------------------------------------------------------------
diff --git 
a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/generated/StellarParser.java
 
b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/generated/StellarParser.java
index 3bd4ad1..3fda80b 100644
--- 
a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/generated/StellarParser.java
+++ 
b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/generated/StellarParser.java
@@ -38,48 +38,53 @@ public class StellarParser extends Parser {
                new PredictionContextCache();
        public static final int
                IN=1, LAMBDA_OP=2, DOUBLE_QUOTE=3, SINGLE_QUOTE=4, COMMA=5, 
PERIOD=6, 
-               AND=7, OR=8, NOT=9, TRUE=10, FALSE=11, EQ=12, NEQ=13, LT=14, 
LTE=15, GT=16, 
-               GTE=17, QUESTION=18, COLON=19, IF=20, THEN=21, ELSE=22, 
NULL=23, NAN=24, 
-               MATCH=25, DEFAULT=26, MATCH_ACTION=27, MINUS=28, PLUS=29, 
DIV=30, MUL=31, 
-               LBRACE=32, RBRACE=33, LBRACKET=34, RBRACKET=35, LPAREN=36, 
RPAREN=37, 
-               NIN=38, EXISTS=39, EXPONENT=40, INT_LITERAL=41, 
DOUBLE_LITERAL=42, FLOAT_LITERAL=43, 
-               LONG_LITERAL=44, IDENTIFIER=45, STRING_LITERAL=46, COMMENT=47, 
WS=48;
+               AND=7, OR=8, NOT=9, TRUE=10, FALSE=11, ASSIGN=12, 
COLON_ASSIGN=13, PLUSASSIGN=14, 
+               MINUSASSIGN=15, DIVIDEASSIGN=16, MULTASSIGN=17, EQ=18, NEQ=19, 
LT=20, 
+               LTE=21, GT=22, GTE=23, QUESTION=24, COLON=25, IF=26, THEN=27, 
ELSE=28, 
+               NULL=29, NAN=30, MATCH=31, DEFAULT=32, MATCH_ACTION=33, 
MINUS=34, MINUSMINUS=35, 
+               PLUS=36, PLUSPLUS=37, DIV=38, MUL=39, LBRACE=40, RBRACE=41, 
LBRACKET=42, 
+               RBRACKET=43, LPAREN=44, RPAREN=45, NIN=46, EXISTS=47, 
EXPONENT=48, INT_LITERAL=49, 
+               DOUBLE_LITERAL=50, FLOAT_LITERAL=51, LONG_LITERAL=52, 
IDENTIFIER=53, STRING_LITERAL=54, 
+               COMMENT=55, WS=56;
        public static final int
-               RULE_transformation = 0, RULE_transformation_expr = 1, 
RULE_if_expr = 2, 
-               RULE_then_expr = 3, RULE_else_expr = 4, RULE_conditional_expr = 
5, RULE_logical_expr = 6, 
-               RULE_b_expr = 7, RULE_in_expr = 8, RULE_comparison_expr = 9, 
RULE_transformation_entity = 10, 
-               RULE_comp_operator = 11, RULE_func_args = 12, RULE_op_list = 
13, RULE_list_entity = 14, 
-               RULE_kv_list = 15, RULE_map_entity = 16, RULE_arithmetic_expr = 
17, RULE_arithmetic_expr_mul = 18, 
-               RULE_functions = 19, RULE_arithmetic_operands = 20, 
RULE_identifier_operand = 21, 
-               RULE_default_operand = 22, RULE_lambda_without_args = 23, 
RULE_lambda_with_args = 24, 
-               RULE_lambda_variables = 25, RULE_single_lambda_variable = 26, 
RULE_lambda_variable = 27, 
-               RULE_match_expr = 28, RULE_match_clauses = 29, 
RULE_match_clause = 30, 
-               RULE_match_clause_action = 31, RULE_match_clause_check = 32;
+               RULE_transformation = 0, RULE_transformation_expr = 1, 
RULE_assign_expr = 2, 
+               RULE_pre_expr = 3, RULE_post_expr = 4, RULE_if_expr = 5, 
RULE_then_expr = 6, 
+               RULE_else_expr = 7, RULE_conditional_expr = 8, 
RULE_logical_expr = 9, 
+               RULE_b_expr = 10, RULE_in_expr = 11, RULE_comparison_expr = 12, 
RULE_transformation_entity = 13, 
+               RULE_comp_operator = 14, RULE_func_args = 15, RULE_op_list = 
16, RULE_list_entity = 17, 
+               RULE_kv_list = 18, RULE_map_entity = 19, RULE_arithmetic_expr = 
20, RULE_arithmetic_expr_mul = 21, 
+               RULE_functions = 22, RULE_arithmetic_operands = 23, 
RULE_identifier_operand = 24, 
+               RULE_default_operand = 25, RULE_lambda_without_args = 26, 
RULE_lambda_with_args = 27, 
+               RULE_lambda_variables = 28, RULE_single_lambda_variable = 29, 
RULE_lambda_variable = 30, 
+               RULE_match_expr = 31, RULE_match_clauses = 32, 
RULE_match_clause = 33, 
+               RULE_match_clause_action = 34, RULE_match_clause_check = 35;
        public static final String[] ruleNames = {
-               "transformation", "transformation_expr", "if_expr", 
"then_expr", "else_expr", 
-               "conditional_expr", "logical_expr", "b_expr", "in_expr", 
"comparison_expr", 
-               "transformation_entity", "comp_operator", "func_args", 
"op_list", "list_entity", 
-               "kv_list", "map_entity", "arithmetic_expr", 
"arithmetic_expr_mul", "functions", 
-               "arithmetic_operands", "identifier_operand", "default_operand", 
"lambda_without_args", 
-               "lambda_with_args", "lambda_variables", 
"single_lambda_variable", "lambda_variable", 
-               "match_expr", "match_clauses", "match_clause", 
"match_clause_action", 
-               "match_clause_check"
+               "transformation", "transformation_expr", "assign_expr", 
"pre_expr", "post_expr", 
+               "if_expr", "then_expr", "else_expr", "conditional_expr", 
"logical_expr", 
+               "b_expr", "in_expr", "comparison_expr", 
"transformation_entity", "comp_operator", 
+               "func_args", "op_list", "list_entity", "kv_list", "map_entity", 
"arithmetic_expr", 
+               "arithmetic_expr_mul", "functions", "arithmetic_operands", 
"identifier_operand", 
+               "default_operand", "lambda_without_args", "lambda_with_args", 
"lambda_variables", 
+               "single_lambda_variable", "lambda_variable", "match_expr", 
"match_clauses", 
+               "match_clause", "match_clause_action", "match_clause_check"
        };
 
        private static final String[] _LITERAL_NAMES = {
                null, null, "'->'", "'\"'", "'''", "','", "'.'", null, null, 
null, null, 
-               null, "'=='", "'!='", "'<'", "'<='", "'>'", "'>='", "'?'", 
"':'", null, 
-               null, null, null, "'NaN'", null, null, "'=>'", "'-'", "'+'", 
"'/'", "'*'", 
-               "'{'", "'}'", "'['", "']'", "'('", "')'"
+               null, "'='", "':='", "'+='", "'-='", "'/='", "'*='", "'=='", 
"'!='", "'<'", 
+               "'<='", "'>'", "'>='", "'?'", "':'", null, null, null, null, 
"'NaN'", 
+               null, null, "'=>'", "'-'", "'--'", "'+'", "'++'", "'/'", "'*'", 
"'{'", 
+               "'}'", "'['", "']'", "'('", "')'"
        };
        private static final String[] _SYMBOLIC_NAMES = {
                null, "IN", "LAMBDA_OP", "DOUBLE_QUOTE", "SINGLE_QUOTE", 
"COMMA", "PERIOD", 
-               "AND", "OR", "NOT", "TRUE", "FALSE", "EQ", "NEQ", "LT", "LTE", 
"GT", "GTE", 
-               "QUESTION", "COLON", "IF", "THEN", "ELSE", "NULL", "NAN", 
"MATCH", "DEFAULT", 
-               "MATCH_ACTION", "MINUS", "PLUS", "DIV", "MUL", "LBRACE", 
"RBRACE", "LBRACKET", 
-               "RBRACKET", "LPAREN", "RPAREN", "NIN", "EXISTS", "EXPONENT", 
"INT_LITERAL", 
-               "DOUBLE_LITERAL", "FLOAT_LITERAL", "LONG_LITERAL", 
"IDENTIFIER", "STRING_LITERAL", 
-               "COMMENT", "WS"
+               "AND", "OR", "NOT", "TRUE", "FALSE", "ASSIGN", "COLON_ASSIGN", 
"PLUSASSIGN", 
+               "MINUSASSIGN", "DIVIDEASSIGN", "MULTASSIGN", "EQ", "NEQ", "LT", 
"LTE", 
+               "GT", "GTE", "QUESTION", "COLON", "IF", "THEN", "ELSE", "NULL", 
"NAN", 
+               "MATCH", "DEFAULT", "MATCH_ACTION", "MINUS", "MINUSMINUS", 
"PLUS", "PLUSPLUS", 
+               "DIV", "MUL", "LBRACE", "RBRACE", "LBRACKET", "RBRACKET", 
"LPAREN", "RPAREN", 
+               "NIN", "EXISTS", "EXPONENT", "INT_LITERAL", "DOUBLE_LITERAL", 
"FLOAT_LITERAL", 
+               "LONG_LITERAL", "IDENTIFIER", "STRING_LITERAL", "COMMENT", "WS"
        };
        public static final Vocabulary VOCABULARY = new 
VocabularyImpl(_LITERAL_NAMES, _SYMBOLIC_NAMES);
 
@@ -155,9 +160,9 @@ public class StellarParser extends Parser {
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(66);
+                       setState(72);
                        transformation_expr();
-                       setState(67);
+                       setState(73);
                        match(EOF);
                        }
                }
@@ -211,6 +216,34 @@ public class StellarParser extends Parser {
                        if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitLogicalExpression(this);
                }
        }
+       public static class PostEprContext extends Transformation_exprContext {
+               public Post_exprContext post_expr() {
+                       return getRuleContext(Post_exprContext.class,0);
+               }
+               public PostEprContext(Transformation_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPostEpr(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPostEpr(this);
+               }
+       }
+       public static class PreExprContext extends Transformation_exprContext {
+               public Pre_exprContext pre_expr() {
+                       return getRuleContext(Pre_exprContext.class,0);
+               }
+               public PreExprContext(Transformation_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPreExpr(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPreExpr(this);
+               }
+       }
        public static class TransformationEntityContext extends 
Transformation_exprContext {
                public Transformation_entityContext transformation_entity() {
                        return 
getRuleContext(Transformation_entityContext.class,0);
@@ -297,18 +330,32 @@ public class StellarParser extends Parser {
                        if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitMatchExpr(this);
                }
        }
+       public static class AssignExprContext extends 
Transformation_exprContext {
+               public Assign_exprContext assign_expr() {
+                       return getRuleContext(Assign_exprContext.class,0);
+               }
+               public AssignExprContext(Transformation_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterAssignExpr(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitAssignExpr(this);
+               }
+       }
 
        public final Transformation_exprContext transformation_expr() throws 
RecognitionException {
                Transformation_exprContext _localctx = new 
Transformation_exprContext(_ctx, getState());
                enterRule(_localctx, 2, RULE_transformation_expr);
                try {
-                       setState(80);
+                       setState(89);
                        switch ( 
getInterpreter().adaptivePredict(_input,0,_ctx) ) {
                        case 1:
                                _localctx = new 
ConditionalExprContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(69);
+                               setState(75);
                                conditional_expr();
                                }
                                break;
@@ -316,11 +363,11 @@ public class StellarParser extends Parser {
                                _localctx = new 
TransformationExprContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(70);
+                               setState(76);
                                match(LPAREN);
-                               setState(71);
+                               setState(77);
                                transformation_expr();
-                               setState(72);
+                               setState(78);
                                match(RPAREN);
                                }
                                break;
@@ -328,7 +375,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
ArithExpressionContext(_localctx);
                                enterOuterAlt(_localctx, 3);
                                {
-                               setState(74);
+                               setState(80);
                                arithmetic_expr(0);
                                }
                                break;
@@ -336,7 +383,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
TransformationEntityContext(_localctx);
                                enterOuterAlt(_localctx, 4);
                                {
-                               setState(75);
+                               setState(81);
                                transformation_entity();
                                }
                                break;
@@ -344,7 +391,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
ComparisonExpressionContext(_localctx);
                                enterOuterAlt(_localctx, 5);
                                {
-                               setState(76);
+                               setState(82);
                                comparison_expr(0);
                                }
                                break;
@@ -352,7 +399,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
LogicalExpressionContext(_localctx);
                                enterOuterAlt(_localctx, 6);
                                {
-                               setState(77);
+                               setState(83);
                                logical_expr();
                                }
                                break;
@@ -360,7 +407,7 @@ public class StellarParser extends Parser {
                                _localctx = new InExpressionContext(_localctx);
                                enterOuterAlt(_localctx, 7);
                                {
-                               setState(78);
+                               setState(84);
                                in_expr();
                                }
                                break;
@@ -368,10 +415,389 @@ public class StellarParser extends Parser {
                                _localctx = new MatchExprContext(_localctx);
                                enterOuterAlt(_localctx, 8);
                                {
-                               setState(79);
+                               setState(85);
                                match_expr();
                                }
                                break;
+                       case 9:
+                               _localctx = new AssignExprContext(_localctx);
+                               enterOuterAlt(_localctx, 9);
+                               {
+                               setState(86);
+                               assign_expr();
+                               }
+                               break;
+                       case 10:
+                               _localctx = new PreExprContext(_localctx);
+                               enterOuterAlt(_localctx, 10);
+                               {
+                               setState(87);
+                               pre_expr();
+                               }
+                               break;
+                       case 11:
+                               _localctx = new PostEprContext(_localctx);
+                               enterOuterAlt(_localctx, 11);
+                               {
+                               setState(88);
+                               post_expr();
+                               }
+                               break;
+                       }
+               }
+               catch (RecognitionException re) {
+                       _localctx.exception = re;
+                       _errHandler.reportError(this, re);
+                       _errHandler.recover(this, re);
+               }
+               finally {
+                       exitRule();
+               }
+               return _localctx;
+       }
+
+       public static class Assign_exprContext extends ParserRuleContext {
+               public Assign_exprContext(ParserRuleContext parent, int 
invokingState) {
+                       super(parent, invokingState);
+               }
+               @Override public int getRuleIndex() { return RULE_assign_expr; }
+        
+               public Assign_exprContext() { }
+               public void copyFrom(Assign_exprContext ctx) {
+                       super.copyFrom(ctx);
+               }
+       }
+       public static class AssignExpressionContext extends Assign_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode ASSIGN() { return 
getToken(StellarParser.ASSIGN, 0); }
+               public Transformation_exprContext transformation_expr() {
+                       return 
getRuleContext(Transformation_exprContext.class,0);
+               }
+               public AssignExpressionContext(Assign_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterAssignExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitAssignExpression(this);
+               }
+       }
+       public static class DivideAssignExpressionContext extends 
Assign_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode DIVIDEASSIGN() { return 
getToken(StellarParser.DIVIDEASSIGN, 0); }
+               public Transformation_exprContext transformation_expr() {
+                       return 
getRuleContext(Transformation_exprContext.class,0);
+               }
+               public DivideAssignExpressionContext(Assign_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterDivideAssignExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitDivideAssignExpression(this);
+               }
+       }
+       public static class PlusAssignExpressionContext extends 
Assign_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode PLUSASSIGN() { return 
getToken(StellarParser.PLUSASSIGN, 0); }
+               public Transformation_exprContext transformation_expr() {
+                       return 
getRuleContext(Transformation_exprContext.class,0);
+               }
+               public PlusAssignExpressionContext(Assign_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPlusAssignExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPlusAssignExpression(this);
+               }
+       }
+       public static class MultiAssignExpressionContext extends 
Assign_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode MULTASSIGN() { return 
getToken(StellarParser.MULTASSIGN, 0); }
+               public Transformation_exprContext transformation_expr() {
+                       return 
getRuleContext(Transformation_exprContext.class,0);
+               }
+               public MultiAssignExpressionContext(Assign_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterMultiAssignExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitMultiAssignExpression(this);
+               }
+       }
+       public static class ColonAssignExpressionContext extends 
Assign_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode COLON_ASSIGN() { return 
getToken(StellarParser.COLON_ASSIGN, 0); }
+               public Transformation_exprContext transformation_expr() {
+                       return 
getRuleContext(Transformation_exprContext.class,0);
+               }
+               public ColonAssignExpressionContext(Assign_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterColonAssignExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitColonAssignExpression(this);
+               }
+       }
+       public static class MinusAssignExpressionContext extends 
Assign_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode MINUSASSIGN() { return 
getToken(StellarParser.MINUSASSIGN, 0); }
+               public Transformation_exprContext transformation_expr() {
+                       return 
getRuleContext(Transformation_exprContext.class,0);
+               }
+               public MinusAssignExpressionContext(Assign_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterMinusAssignExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitMinusAssignExpression(this);
+               }
+       }
+
+       public final Assign_exprContext assign_expr() throws 
RecognitionException {
+               Assign_exprContext _localctx = new Assign_exprContext(_ctx, 
getState());
+               enterRule(_localctx, 4, RULE_assign_expr);
+               try {
+                       setState(109);
+                       switch ( 
getInterpreter().adaptivePredict(_input,1,_ctx) ) {
+                       case 1:
+                               _localctx = new 
AssignExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 1);
+                               {
+                               setState(91);
+                               match(IDENTIFIER);
+                               setState(92);
+                               match(ASSIGN);
+                               setState(93);
+                               transformation_expr();
+                               }
+                               break;
+                       case 2:
+                               _localctx = new 
ColonAssignExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 2);
+                               {
+                               setState(94);
+                               match(IDENTIFIER);
+                               setState(95);
+                               match(COLON_ASSIGN);
+                               setState(96);
+                               transformation_expr();
+                               }
+                               break;
+                       case 3:
+                               _localctx = new 
PlusAssignExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 3);
+                               {
+                               setState(97);
+                               match(IDENTIFIER);
+                               setState(98);
+                               match(PLUSASSIGN);
+                               setState(99);
+                               transformation_expr();
+                               }
+                               break;
+                       case 4:
+                               _localctx = new 
MinusAssignExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 4);
+                               {
+                               setState(100);
+                               match(IDENTIFIER);
+                               setState(101);
+                               match(MINUSASSIGN);
+                               setState(102);
+                               transformation_expr();
+                               }
+                               break;
+                       case 5:
+                               _localctx = new 
DivideAssignExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 5);
+                               {
+                               setState(103);
+                               match(IDENTIFIER);
+                               setState(104);
+                               match(DIVIDEASSIGN);
+                               setState(105);
+                               transformation_expr();
+                               }
+                               break;
+                       case 6:
+                               _localctx = new 
MultiAssignExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 6);
+                               {
+                               setState(106);
+                               match(IDENTIFIER);
+                               setState(107);
+                               match(MULTASSIGN);
+                               setState(108);
+                               transformation_expr();
+                               }
+                               break;
+                       }
+               }
+               catch (RecognitionException re) {
+                       _localctx.exception = re;
+                       _errHandler.reportError(this, re);
+                       _errHandler.recover(this, re);
+               }
+               finally {
+                       exitRule();
+               }
+               return _localctx;
+       }
+
+       public static class Pre_exprContext extends ParserRuleContext {
+               public Pre_exprContext(ParserRuleContext parent, int 
invokingState) {
+                       super(parent, invokingState);
+               }
+               @Override public int getRuleIndex() { return RULE_pre_expr; }
+        
+               public Pre_exprContext() { }
+               public void copyFrom(Pre_exprContext ctx) {
+                       super.copyFrom(ctx);
+               }
+       }
+       public static class PreDecrementExpressionContext extends 
Pre_exprContext {
+               public TerminalNode MINUSMINUS() { return 
getToken(StellarParser.MINUSMINUS, 0); }
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public PreDecrementExpressionContext(Pre_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPreDecrementExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPreDecrementExpression(this);
+               }
+       }
+       public static class PreIncrementExpressionContext extends 
Pre_exprContext {
+               public TerminalNode PLUSPLUS() { return 
getToken(StellarParser.PLUSPLUS, 0); }
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public PreIncrementExpressionContext(Pre_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPreIncrementExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPreIncrementExpression(this);
+               }
+       }
+
+       public final Pre_exprContext pre_expr() throws RecognitionException {
+               Pre_exprContext _localctx = new Pre_exprContext(_ctx, 
getState());
+               enterRule(_localctx, 6, RULE_pre_expr);
+               try {
+                       setState(115);
+                       switch (_input.LA(1)) {
+                       case PLUSPLUS:
+                               _localctx = new 
PreIncrementExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 1);
+                               {
+                               setState(111);
+                               match(PLUSPLUS);
+                               setState(112);
+                               match(IDENTIFIER);
+                               }
+                               break;
+                       case MINUSMINUS:
+                               _localctx = new 
PreDecrementExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 2);
+                               {
+                               setState(113);
+                               match(MINUSMINUS);
+                               setState(114);
+                               match(IDENTIFIER);
+                               }
+                               break;
+                       default:
+                               throw new NoViableAltException(this);
+                       }
+               }
+               catch (RecognitionException re) {
+                       _localctx.exception = re;
+                       _errHandler.reportError(this, re);
+                       _errHandler.recover(this, re);
+               }
+               finally {
+                       exitRule();
+               }
+               return _localctx;
+       }
+
+       public static class Post_exprContext extends ParserRuleContext {
+               public Post_exprContext(ParserRuleContext parent, int 
invokingState) {
+                       super(parent, invokingState);
+               }
+               @Override public int getRuleIndex() { return RULE_post_expr; }
+        
+               public Post_exprContext() { }
+               public void copyFrom(Post_exprContext ctx) {
+                       super.copyFrom(ctx);
+               }
+       }
+       public static class PostIncrementExpressionContext extends 
Post_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode PLUSPLUS() { return 
getToken(StellarParser.PLUSPLUS, 0); }
+               public PostIncrementExpressionContext(Post_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPostIncrementExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPostIncrementExpression(this);
+               }
+       }
+       public static class PostDecrementExpressionContext extends 
Post_exprContext {
+               public TerminalNode IDENTIFIER() { return 
getToken(StellarParser.IDENTIFIER, 0); }
+               public TerminalNode MINUSMINUS() { return 
getToken(StellarParser.MINUSMINUS, 0); }
+               public PostDecrementExpressionContext(Post_exprContext ctx) { 
copyFrom(ctx); }
+               @Override
+               public void enterRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).enterPostDecrementExpression(this);
+               }
+               @Override
+               public void exitRule(ParseTreeListener listener) {
+                       if ( listener instanceof StellarListener ) 
((StellarListener)listener).exitPostDecrementExpression(this);
+               }
+       }
+
+       public final Post_exprContext post_expr() throws RecognitionException {
+               Post_exprContext _localctx = new Post_exprContext(_ctx, 
getState());
+               enterRule(_localctx, 8, RULE_post_expr);
+               try {
+                       setState(121);
+                       switch ( 
getInterpreter().adaptivePredict(_input,3,_ctx) ) {
+                       case 1:
+                               _localctx = new 
PostIncrementExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 1);
+                               {
+                               setState(117);
+                               match(IDENTIFIER);
+                               setState(118);
+                               match(PLUSPLUS);
+                               }
+                               break;
+                       case 2:
+                               _localctx = new 
PostDecrementExpressionContext(_localctx);
+                               enterOuterAlt(_localctx, 2);
+                               {
+                               setState(119);
+                               match(IDENTIFIER);
+                               setState(120);
+                               match(MINUSMINUS);
+                               }
+                               break;
                        }
                }
                catch (RecognitionException re) {
@@ -405,11 +831,11 @@ public class StellarParser extends Parser {
 
        public final If_exprContext if_expr() throws RecognitionException {
                If_exprContext _localctx = new If_exprContext(_ctx, getState());
-               enterRule(_localctx, 4, RULE_if_expr);
+               enterRule(_localctx, 10, RULE_if_expr);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(82);
+                       setState(123);
                        logical_expr();
                        }
                }
@@ -444,11 +870,11 @@ public class StellarParser extends Parser {
 
        public final Then_exprContext then_expr() throws RecognitionException {
                Then_exprContext _localctx = new Then_exprContext(_ctx, 
getState());
-               enterRule(_localctx, 6, RULE_then_expr);
+               enterRule(_localctx, 12, RULE_then_expr);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(84);
+                       setState(125);
                        transformation_expr();
                        }
                }
@@ -483,11 +909,11 @@ public class StellarParser extends Parser {
 
        public final Else_exprContext else_expr() throws RecognitionException {
                Else_exprContext _localctx = new Else_exprContext(_ctx, 
getState());
-               enterRule(_localctx, 8, RULE_else_expr);
+               enterRule(_localctx, 14, RULE_else_expr);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(86);
+                       setState(127);
                        transformation_expr();
                        }
                }
@@ -561,9 +987,9 @@ public class StellarParser extends Parser {
 
        public final Conditional_exprContext conditional_expr() throws 
RecognitionException {
                Conditional_exprContext _localctx = new 
Conditional_exprContext(_ctx, getState());
-               enterRule(_localctx, 10, RULE_conditional_expr);
+               enterRule(_localctx, 16, RULE_conditional_expr);
                try {
-                       setState(101);
+                       setState(142);
                        switch (_input.LA(1)) {
                        case NOT:
                        case TRUE:
@@ -583,15 +1009,15 @@ public class StellarParser extends Parser {
                                _localctx = new 
TernaryFuncWithoutIfContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(88);
+                               setState(129);
                                if_expr();
-                               setState(89);
+                               setState(130);
                                match(QUESTION);
-                               setState(90);
+                               setState(131);
                                then_expr();
-                               setState(91);
+                               setState(132);
                                match(COLON);
-                               setState(92);
+                               setState(133);
                                else_expr();
                                }
                                break;
@@ -599,17 +1025,17 @@ public class StellarParser extends Parser {
                                _localctx = new 
TernaryFuncWithIfContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(94);
+                               setState(135);
                                match(IF);
-                               setState(95);
+                               setState(136);
                                if_expr();
-                               setState(96);
+                               setState(137);
                                match(THEN);
-                               setState(97);
+                               setState(138);
                                then_expr();
-                               setState(98);
+                               setState(139);
                                match(ELSE);
-                               setState(99);
+                               setState(140);
                                else_expr();
                                }
                                break;
@@ -692,19 +1118,19 @@ public class StellarParser extends Parser {
 
        public final Logical_exprContext logical_expr() throws 
RecognitionException {
                Logical_exprContext _localctx = new Logical_exprContext(_ctx, 
getState());
-               enterRule(_localctx, 12, RULE_logical_expr);
+               enterRule(_localctx, 18, RULE_logical_expr);
                try {
-                       setState(112);
-                       switch ( 
getInterpreter().adaptivePredict(_input,2,_ctx) ) {
+                       setState(153);
+                       switch ( 
getInterpreter().adaptivePredict(_input,5,_ctx) ) {
                        case 1:
                                _localctx = new 
LogicalExpressionAndContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(103);
+                               setState(144);
                                b_expr();
-                               setState(104);
+                               setState(145);
                                match(AND);
-                               setState(105);
+                               setState(146);
                                logical_expr();
                                }
                                break;
@@ -712,11 +1138,11 @@ public class StellarParser extends Parser {
                                _localctx = new 
LogicalExpressionOrContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(107);
+                               setState(148);
                                b_expr();
-                               setState(108);
+                               setState(149);
                                match(OR);
-                               setState(109);
+                               setState(150);
                                logical_expr();
                                }
                                break;
@@ -724,7 +1150,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
BoleanExpressionContext(_localctx);
                                enterOuterAlt(_localctx, 3);
                                {
-                               setState(111);
+                               setState(152);
                                b_expr();
                                }
                                break;
@@ -764,21 +1190,21 @@ public class StellarParser extends Parser {
 
        public final B_exprContext b_expr() throws RecognitionException {
                B_exprContext _localctx = new B_exprContext(_ctx, getState());
-               enterRule(_localctx, 14, RULE_b_expr);
+               enterRule(_localctx, 20, RULE_b_expr);
                try {
-                       setState(116);
-                       switch ( 
getInterpreter().adaptivePredict(_input,3,_ctx) ) {
+                       setState(157);
+                       switch ( 
getInterpreter().adaptivePredict(_input,6,_ctx) ) {
                        case 1:
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(114);
+                               setState(155);
                                comparison_expr(0);
                                }
                                break;
                        case 2:
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(115);
+                               setState(156);
                                in_expr();
                                }
                                break;
@@ -845,19 +1271,19 @@ public class StellarParser extends Parser {
 
        public final In_exprContext in_expr() throws RecognitionException {
                In_exprContext _localctx = new In_exprContext(_ctx, getState());
-               enterRule(_localctx, 16, RULE_in_expr);
+               enterRule(_localctx, 22, RULE_in_expr);
                try {
-                       setState(126);
-                       switch ( 
getInterpreter().adaptivePredict(_input,4,_ctx) ) {
+                       setState(167);
+                       switch ( 
getInterpreter().adaptivePredict(_input,7,_ctx) ) {
                        case 1:
                                _localctx = new 
InExpressionStatementContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(118);
+                               setState(159);
                                identifier_operand();
-                               setState(119);
+                               setState(160);
                                match(IN);
-                               setState(120);
+                               setState(161);
                                b_expr();
                                }
                                break;
@@ -865,11 +1291,11 @@ public class StellarParser extends Parser {
                                _localctx = new 
NInExpressionStatementContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(122);
+                               setState(163);
                                identifier_operand();
-                               setState(123);
+                               setState(164);
                                match(NIN);
-                               setState(124);
+                               setState(165);
                                b_expr();
                                }
                                break;
@@ -974,27 +1400,27 @@ public class StellarParser extends Parser {
                int _parentState = getState();
                Comparison_exprContext _localctx = new 
Comparison_exprContext(_ctx, _parentState);
                Comparison_exprContext _prevctx = _localctx;
-               int _startState = 18;
-               enterRecursionRule(_localctx, 18, RULE_comparison_expr, _p);
+               int _startState = 24;
+               enterRecursionRule(_localctx, 24, RULE_comparison_expr, _p);
                try {
                        int _alt;
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(139);
-                       switch ( 
getInterpreter().adaptivePredict(_input,5,_ctx) ) {
+                       setState(180);
+                       switch ( 
getInterpreter().adaptivePredict(_input,8,_ctx) ) {
                        case 1:
                                {
                                _localctx = new NotFuncContext(_localctx);
                                _ctx = _localctx;
                                _prevctx = _localctx;
 
-                               setState(129);
+                               setState(170);
                                match(NOT);
-                               setState(130);
+                               setState(171);
                                match(LPAREN);
-                               setState(131);
+                               setState(172);
                                logical_expr();
-                               setState(132);
+                               setState(173);
                                match(RPAREN);
                                }
                                break;
@@ -1003,11 +1429,11 @@ public class StellarParser extends Parser {
                                _localctx = new 
ComparisonExpressionParensContext(_localctx);
                                _ctx = _localctx;
                                _prevctx = _localctx;
-                               setState(134);
+                               setState(175);
                                match(LPAREN);
-                               setState(135);
+                               setState(176);
                                logical_expr();
-                               setState(136);
+                               setState(177);
                                match(RPAREN);
                                }
                                break;
@@ -1016,15 +1442,15 @@ public class StellarParser extends Parser {
                                _localctx = new OperandContext(_localctx);
                                _ctx = _localctx;
                                _prevctx = _localctx;
-                               setState(138);
+                               setState(179);
                                identifier_operand();
                                }
                                break;
                        }
                        _ctx.stop = _input.LT(-1);
-                       setState(147);
+                       setState(188);
                        _errHandler.sync(this);
-                       _alt = getInterpreter().adaptivePredict(_input,6,_ctx);
+                       _alt = getInterpreter().adaptivePredict(_input,9,_ctx);
                        while ( _alt!=2 && 
_alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
                                if ( _alt==1 ) {
                                        if ( _parseListeners!=null ) 
triggerExitRuleEvent();
@@ -1033,18 +1459,18 @@ public class StellarParser extends Parser {
                                        {
                                        _localctx = new 
ComparisonExpressionWithOperatorContext(new Comparison_exprContext(_parentctx, 
_parentState));
                                        pushNewRecursionContext(_localctx, 
_startState, RULE_comparison_expr);
-                                       setState(141);
+                                       setState(182);
                                        if (!(precpred(_ctx, 4))) throw new 
FailedPredicateException(this, "precpred(_ctx, 4)");
-                                       setState(142);
+                                       setState(183);
                                        comp_operator();
-                                       setState(143);
+                                       setState(184);
                                        comparison_expr(5);
                                        }
                                        } 
                                }
-                               setState(149);
+                               setState(190);
                                _errHandler.sync(this);
-                               _alt = 
getInterpreter().adaptivePredict(_input,6,_ctx);
+                               _alt = 
getInterpreter().adaptivePredict(_input,9,_ctx);
                        }
                        }
                }
@@ -1079,11 +1505,11 @@ public class StellarParser extends Parser {
 
        public final Transformation_entityContext transformation_entity() 
throws RecognitionException {
                Transformation_entityContext _localctx = new 
Transformation_entityContext(_ctx, getState());
-               enterRule(_localctx, 20, RULE_transformation_entity);
+               enterRule(_localctx, 26, RULE_transformation_entity);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(150);
+                       setState(191);
                        identifier_operand();
                        }
                }
@@ -1129,13 +1555,13 @@ public class StellarParser extends Parser {
 
        public final Comp_operatorContext comp_operator() throws 
RecognitionException {
                Comp_operatorContext _localctx = new Comp_operatorContext(_ctx, 
getState());
-               enterRule(_localctx, 22, RULE_comp_operator);
+               enterRule(_localctx, 28, RULE_comp_operator);
                int _la;
                try {
                        _localctx = new ComparisonOpContext(_localctx);
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(152);
+                       setState(193);
                        _la = _input.LA(1);
                        if ( !((((_la) & ~0x3f) == 0 && ((1L << _la) & ((1L << 
EQ) | (1L << NEQ) | (1L << LT) | (1L << LTE) | (1L << GT) | (1L << GTE))) != 
0)) ) {
                        _errHandler.recoverInline(this);
@@ -1177,27 +1603,27 @@ public class StellarParser extends Parser {
 
        public final Func_argsContext func_args() throws RecognitionException {
                Func_argsContext _localctx = new Func_argsContext(_ctx, 
getState());
-               enterRule(_localctx, 24, RULE_func_args);
+               enterRule(_localctx, 30, RULE_func_args);
                try {
-                       setState(160);
-                       switch ( 
getInterpreter().adaptivePredict(_input,7,_ctx) ) {
+                       setState(201);
+                       switch ( 
getInterpreter().adaptivePredict(_input,10,_ctx) ) {
                        case 1:
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(154);
+                               setState(195);
                                match(LPAREN);
-                               setState(155);
+                               setState(196);
                                op_list(0);
-                               setState(156);
+                               setState(197);
                                match(RPAREN);
                                }
                                break;
                        case 2:
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(158);
+                               setState(199);
                                match(LPAREN);
-                               setState(159);
+                               setState(200);
                                match(RPAREN);
                                }
                                break;
@@ -1251,53 +1677,53 @@ public class StellarParser extends Parser {
                int _parentState = getState();
                Op_listContext _localctx = new Op_listContext(_ctx, 
_parentState);
                Op_listContext _prevctx = _localctx;
-               int _startState = 26;
-               enterRecursionRule(_localctx, 26, RULE_op_list, _p);
+               int _startState = 32;
+               enterRecursionRule(_localctx, 32, RULE_op_list, _p);
                try {
                        int _alt;
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(166);
-                       switch ( 
getInterpreter().adaptivePredict(_input,8,_ctx) ) {
+                       setState(207);
+                       switch ( 
getInterpreter().adaptivePredict(_input,11,_ctx) ) {
                        case 1:
                                {
-                               setState(163);
+                               setState(204);
                                identifier_operand();
                                }
                                break;
                        case 2:
                                {
-                               setState(164);
+                               setState(205);
                                conditional_expr();
                                }
                                break;
                        case 3:
                                {
-                               setState(165);
+                               setState(206);
                                comparison_expr(0);
                                }
                                break;
                        }
                        _ctx.stop = _input.LT(-1);
-                       setState(179);
+                       setState(220);
                        _errHandler.sync(this);
-                       _alt = getInterpreter().adaptivePredict(_input,10,_ctx);
+                       _alt = getInterpreter().adaptivePredict(_input,13,_ctx);
                        while ( _alt!=2 && 
_alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
                                if ( _alt==1 ) {
                                        if ( _parseListeners!=null ) 
triggerExitRuleEvent();
                                        _prevctx = _localctx;
                                        {
-                                       setState(177);
-                                       switch ( 
getInterpreter().adaptivePredict(_input,9,_ctx) ) {
+                                       setState(218);
+                                       switch ( 
getInterpreter().adaptivePredict(_input,12,_ctx) ) {
                                        case 1:
                                                {
                                                _localctx = new 
Op_listContext(_parentctx, _parentState);
                                                
pushNewRecursionContext(_localctx, _startState, RULE_op_list);
-                                               setState(168);
+                                               setState(209);
                                                if (!(precpred(_ctx, 5))) throw 
new FailedPredicateException(this, "precpred(_ctx, 5)");
-                                               setState(169);
+                                               setState(210);
                                                match(COMMA);
-                                               setState(170);
+                                               setState(211);
                                                identifier_operand();
                                                }
                                                break;
@@ -1305,11 +1731,11 @@ public class StellarParser extends Parser {
                                                {
                                                _localctx = new 
Op_listContext(_parentctx, _parentState);
                                                
pushNewRecursionContext(_localctx, _startState, RULE_op_list);
-                                               setState(171);
+                                               setState(212);
                                                if (!(precpred(_ctx, 3))) throw 
new FailedPredicateException(this, "precpred(_ctx, 3)");
-                                               setState(172);
+                                               setState(213);
                                                match(COMMA);
-                                               setState(173);
+                                               setState(214);
                                                conditional_expr();
                                                }
                                                break;
@@ -1317,20 +1743,20 @@ public class StellarParser extends Parser {
                                                {
                                                _localctx = new 
Op_listContext(_parentctx, _parentState);
                                                
pushNewRecursionContext(_localctx, _startState, RULE_op_list);
-                                               setState(174);
+                                               setState(215);
                                                if (!(precpred(_ctx, 1))) throw 
new FailedPredicateException(this, "precpred(_ctx, 1)");
-                                               setState(175);
+                                               setState(216);
                                                match(COMMA);
-                                               setState(176);
+                                               setState(217);
                                                comparison_expr(0);
                                                }
                                                break;
                                        }
                                        } 
                                }
-                               setState(181);
+                               setState(222);
                                _errHandler.sync(this);
-                               _alt = 
getInterpreter().adaptivePredict(_input,10,_ctx);
+                               _alt = 
getInterpreter().adaptivePredict(_input,13,_ctx);
                        }
                        }
                }
@@ -1367,27 +1793,27 @@ public class StellarParser extends Parser {
 
        public final List_entityContext list_entity() throws 
RecognitionException {
                List_entityContext _localctx = new List_entityContext(_ctx, 
getState());
-               enterRule(_localctx, 28, RULE_list_entity);
+               enterRule(_localctx, 34, RULE_list_entity);
                try {
-                       setState(188);
-                       switch ( 
getInterpreter().adaptivePredict(_input,11,_ctx) ) {
+                       setState(229);
+                       switch ( 
getInterpreter().adaptivePredict(_input,14,_ctx) ) {
                        case 1:
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(182);
+                               setState(223);
                                match(LBRACKET);
-                               setState(183);
+                               setState(224);
                                match(RBRACKET);
                                }
                                break;
                        case 2:
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(184);
+                               setState(225);
                                match(LBRACKET);
-                               setState(185);
+                               setState(226);
                                op_list(0);
-                               setState(186);
+                               setState(227);
                                match(RBRACKET);
                                }
                                break;
@@ -1442,59 +1868,59 @@ public class StellarParser extends Parser {
                int _parentState = getState();
                Kv_listContext _localctx = new Kv_listContext(_ctx, 
_parentState);
                Kv_listContext _prevctx = _localctx;
-               int _startState = 30;
-               enterRecursionRule(_localctx, 30, RULE_kv_list, _p);
+               int _startState = 36;
+               enterRecursionRule(_localctx, 36, RULE_kv_list, _p);
                try {
                        int _alt;
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(199);
-                       switch ( 
getInterpreter().adaptivePredict(_input,12,_ctx) ) {
+                       setState(240);
+                       switch ( 
getInterpreter().adaptivePredict(_input,15,_ctx) ) {
                        case 1:
                                {
-                               setState(191);
+                               setState(232);
                                identifier_operand();
-                               setState(192);
+                               setState(233);
                                match(COLON);
-                               setState(193);
+                               setState(234);
                                transformation_expr();
                                }
                                break;
                        case 2:
                                {
-                               setState(195);
+                               setState(236);
                                comparison_expr(0);
-                               setState(196);
+                               setState(237);
                                match(COLON);
-                               setState(197);
+                               setState(238);
                                transformation_expr();
                                }
                                break;
                        }
                        _ctx.stop = _input.LT(-1);
-                       setState(215);
+                       setState(256);
                        _errHandler.sync(this);
-                       _alt = getInterpreter().adaptivePredict(_input,14,_ctx);
+                       _alt = getInterpreter().adaptivePredict(_input,17,_ctx);
                        while ( _alt!=2 && 
_alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
                                if ( _alt==1 ) {
                                        if ( _parseListeners!=null ) 
triggerExitRuleEvent();
                                        _prevctx = _localctx;
                                        {
-                                       setState(213);
-                                       switch ( 
getInterpreter().adaptivePredict(_input,13,_ctx) ) {
+                                       setState(254);
+                                       switch ( 
getInterpreter().adaptivePredict(_input,16,_ctx) ) {
                                        case 1:
                                                {
                                                _localctx = new 
Kv_listContext(_parentctx, _parentState);
                                                
pushNewRecursionContext(_localctx, _startState, RULE_kv_list);
-                                               setState(201);
+                                               setState(242);
                                                if (!(precpred(_ctx, 2))) throw 
new FailedPredicateException(this, "precpred(_ctx, 2)");
-                                               setState(202);
+                                               setState(243);
                                                match(COMMA);
-                                               setState(203);
+                                               setState(244);
                                                identifier_operand();
-                                               setState(204);
+                                               setState(245);
                                                match(COLON);
-                                               setState(205);
+                                               setState(246);
                                                transformation_expr();
                                                }
                                                break;
@@ -1502,24 +1928,24 @@ public class StellarParser extends Parser {
                                                {
                                                _localctx = new 
Kv_listContext(_parentctx, _parentState);
                                                
pushNewRecursionContext(_localctx, _startState, RULE_kv_list);
-                                               setState(207);
+                                               setState(248);
                                                if (!(precpred(_ctx, 1))) throw 
new FailedPredicateException(this, "precpred(_ctx, 1)");
-                                               setState(208);
+                                               setState(249);
                                                match(COMMA);
-                                               setState(209);
+                                               setState(250);
                                                comparison_expr(0);
-                                               setState(210);
+                                               setState(251);
                                                match(COLON);
-                                               setState(211);
+                                               setState(252);
                                                transformation_expr();
                                                }
                                                break;
                                        }
                                        } 
                                }
-                               setState(217);
+                               setState(258);
                                _errHandler.sync(this);
-                               _alt = 
getInterpreter().adaptivePredict(_input,14,_ctx);
+                               _alt = 
getInterpreter().adaptivePredict(_input,17,_ctx);
                        }
                        }
                }
@@ -1556,27 +1982,27 @@ public class StellarParser extends Parser {
 
        public final Map_entityContext map_entity() throws RecognitionException 
{
                Map_entityContext _localctx = new Map_entityContext(_ctx, 
getState());
-               enterRule(_localctx, 32, RULE_map_entity);
+               enterRule(_localctx, 38, RULE_map_entity);
                try {
-                       setState(224);
-                       switch ( 
getInterpreter().adaptivePredict(_input,15,_ctx) ) {
+                       setState(265);
+                       switch ( 
getInterpreter().adaptivePredict(_input,18,_ctx) ) {
                        case 1:
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(218);
+                               setState(259);
                                match(LBRACE);
-                               setState(219);
+                               setState(260);
                                kv_list(0);
-                               setState(220);
+                               setState(261);
                                match(RBRACE);
                                }
                                break;
                        case 2:
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(222);
+                               setState(263);
                                match(LBRACE);
-                               setState(223);
+                               setState(264);
                                match(RBRACE);
                                }
                                break;
@@ -1664,8 +2090,8 @@ public class StellarParser extends Parser {
                int _parentState = getState();
                Arithmetic_exprContext _localctx = new 
Arithmetic_exprContext(_ctx, _parentState);
                Arithmetic_exprContext _prevctx = _localctx;
-               int _startState = 34;
-               enterRecursionRule(_localctx, 34, RULE_arithmetic_expr, _p);
+               int _startState = 40;
+               enterRecursionRule(_localctx, 40, RULE_arithmetic_expr, _p);
                try {
                        int _alt;
                        enterOuterAlt(_localctx, 1);
@@ -1675,29 +2101,29 @@ public class StellarParser extends Parser {
                        _ctx = _localctx;
                        _prevctx = _localctx;
 
-                       setState(227);
+                       setState(268);
                        arithmetic_expr_mul(0);
                        }
                        _ctx.stop = _input.LT(-1);
-                       setState(237);
+                       setState(278);
                        _errHandler.sync(this);
-                       _alt = getInterpreter().adaptivePredict(_input,17,_ctx);
+                       _alt = getInterpreter().adaptivePredict(_input,20,_ctx);
                        while ( _alt!=2 && 
_alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
                                if ( _alt==1 ) {
                                        if ( _parseListeners!=null ) 
triggerExitRuleEvent();
                                        _prevctx = _localctx;
                                        {
-                                       setState(235);
-                                       switch ( 
getInterpreter().adaptivePredict(_input,16,_ctx) ) {
+                                       setState(276);
+                                       switch ( 
getInterpreter().adaptivePredict(_input,19,_ctx) ) {
                                        case 1:
                                                {
                                                _localctx = new 
ArithExpr_plusContext(new Arithmetic_exprContext(_parentctx, _parentState));
                                                
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr);
-                                               setState(229);
+                                               setState(270);
                                                if (!(precpred(_ctx, 2))) throw 
new FailedPredicateException(this, "precpred(_ctx, 2)");
-                                               setState(230);
+                                               setState(271);
                                                match(PLUS);
-                                               setState(231);
+                                               setState(272);
                                                arithmetic_expr_mul(0);
                                                }
                                                break;
@@ -1705,20 +2131,20 @@ public class StellarParser extends Parser {
                                                {
                                                _localctx = new 
ArithExpr_minusContext(new Arithmetic_exprContext(_parentctx, _parentState));
                                                
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr);
-                                               setState(232);
+                                               setState(273);
                                                if (!(precpred(_ctx, 1))) throw 
new FailedPredicateException(this, "precpred(_ctx, 1)");
-                                               setState(233);
+                                               setState(274);
                                                match(MINUS);
-                                               setState(234);
+                                               setState(275);
                                                arithmetic_expr_mul(0);
                                                }
                                                break;
                                        }
                                        } 
                                }
-                               setState(239);
+                               setState(280);
                                _errHandler.sync(this);
-                               _alt = 
getInterpreter().adaptivePredict(_input,17,_ctx);
+                               _alt = 
getInterpreter().adaptivePredict(_input,20,_ctx);
                        }
                        }
                }
@@ -1804,8 +2230,8 @@ public class StellarParser extends Parser {
                int _parentState = getState();
                Arithmetic_expr_mulContext _localctx = new 
Arithmetic_expr_mulContext(_ctx, _parentState);
                Arithmetic_expr_mulContext _prevctx = _localctx;
-               int _startState = 36;
-               enterRecursionRule(_localctx, 36, RULE_arithmetic_expr_mul, _p);
+               int _startState = 42;
+               enterRecursionRule(_localctx, 42, RULE_arithmetic_expr_mul, _p);
                try {
                        int _alt;
                        enterOuterAlt(_localctx, 1);
@@ -1815,29 +2241,29 @@ public class StellarParser extends Parser {
                        _ctx = _localctx;
                        _prevctx = _localctx;
 
-                       setState(241);
+                       setState(282);
                        arithmetic_operands();
                        }
                        _ctx.stop = _input.LT(-1);
-                       setState(251);
+                       setState(292);
                        _errHandler.sync(this);
-                       _alt = getInterpreter().adaptivePredict(_input,19,_ctx);
+                       _alt = getInterpreter().adaptivePredict(_input,22,_ctx);
                        while ( _alt!=2 && 
_alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
                                if ( _alt==1 ) {
                                        if ( _parseListeners!=null ) 
triggerExitRuleEvent();
                                        _prevctx = _localctx;
                                        {
-                                       setState(249);
-                                       switch ( 
getInterpreter().adaptivePredict(_input,18,_ctx) ) {
+                                       setState(290);
+                                       switch ( 
getInterpreter().adaptivePredict(_input,21,_ctx) ) {
                                        case 1:
                                                {
                                                _localctx = new 
ArithExpr_mulContext(new Arithmetic_expr_mulContext(_parentctx, _parentState));
                                                
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr_mul);
-                                               setState(243);
+                                               setState(284);
                                                if (!(precpred(_ctx, 2))) throw 
new FailedPredicateException(this, "precpred(_ctx, 2)");
-                                               setState(244);
+                                               setState(285);
                                                match(MUL);
-                                               setState(245);
+                                               setState(286);
                                                arithmetic_expr_mul(3);
                                                }
                                                break;
@@ -1845,20 +2271,20 @@ public class StellarParser extends Parser {
                                                {
                                                _localctx = new 
ArithExpr_divContext(new Arithmetic_expr_mulContext(_parentctx, _parentState));
                                                
pushNewRecursionContext(_localctx, _startState, RULE_arithmetic_expr_mul);
-                                               setState(246);
+                                               setState(287);
                                                if (!(precpred(_ctx, 1))) throw 
new FailedPredicateException(this, "precpred(_ctx, 1)");
-                                               setState(247);
+                                               setState(288);
                                                match(DIV);
-                                               setState(248);
+                                               setState(289);
                                                arithmetic_expr_mul(2);
                                                }
                                                break;
                                        }
                                        } 
                                }
-                               setState(253);
+                               setState(294);
                                _errHandler.sync(this);
-                               _alt = 
getInterpreter().adaptivePredict(_input,19,_ctx);
+                               _alt = 
getInterpreter().adaptivePredict(_input,22,_ctx);
                        }
                        }
                }
@@ -1902,14 +2328,14 @@ public class StellarParser extends Parser {
 
        public final FunctionsContext functions() throws RecognitionException {
                FunctionsContext _localctx = new FunctionsContext(_ctx, 
getState());
-               enterRule(_localctx, 38, RULE_functions);
+               enterRule(_localctx, 44, RULE_functions);
                try {
                        _localctx = new TransformationFuncContext(_localctx);
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(254);
+                       setState(295);
                        match(IDENTIFIER);
-                       setState(255);
+                       setState(296);
                        func_args();
                        }
                }
@@ -2056,15 +2482,15 @@ public class StellarParser extends Parser {
 
        public final Arithmetic_operandsContext arithmetic_operands() throws 
RecognitionException {
                Arithmetic_operandsContext _localctx = new 
Arithmetic_operandsContext(_ctx, getState());
-               enterRule(_localctx, 40, RULE_arithmetic_operands);
+               enterRule(_localctx, 46, RULE_arithmetic_operands);
                try {
-                       setState(272);
-                       switch ( 
getInterpreter().adaptivePredict(_input,20,_ctx) ) {
+                       setState(313);
+                       switch ( 
getInterpreter().adaptivePredict(_input,23,_ctx) ) {
                        case 1:
                                _localctx = new 
NumericFunctionsContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(257);
+                               setState(298);
                                functions();
                                }
                                break;
@@ -2072,7 +2498,7 @@ public class StellarParser extends Parser {
                                _localctx = new DoubleLiteralContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(258);
+                               setState(299);
                                match(DOUBLE_LITERAL);
                                }
                                break;
@@ -2080,7 +2506,7 @@ public class StellarParser extends Parser {
                                _localctx = new IntLiteralContext(_localctx);
                                enterOuterAlt(_localctx, 3);
                                {
-                               setState(259);
+                               setState(300);
                                match(INT_LITERAL);
                                }
                                break;
@@ -2088,7 +2514,7 @@ public class StellarParser extends Parser {
                                _localctx = new LongLiteralContext(_localctx);
                                enterOuterAlt(_localctx, 4);
                                {
-                               setState(260);
+                               setState(301);
                                match(LONG_LITERAL);
                                }
                                break;
@@ -2096,7 +2522,7 @@ public class StellarParser extends Parser {
                                _localctx = new FloatLiteralContext(_localctx);
                                enterOuterAlt(_localctx, 5);
                                {
-                               setState(261);
+                               setState(302);
                                match(FLOAT_LITERAL);
                                }
                                break;
@@ -2104,7 +2530,7 @@ public class StellarParser extends Parser {
                                _localctx = new VariableContext(_localctx);
                                enterOuterAlt(_localctx, 6);
                                {
-                               setState(262);
+                               setState(303);
                                match(IDENTIFIER);
                                }
                                break;
@@ -2112,7 +2538,7 @@ public class StellarParser extends Parser {
                                _localctx = new NaNArithContext(_localctx);
                                enterOuterAlt(_localctx, 7);
                                {
-                               setState(263);
+                               setState(304);
                                match(NAN);
                                }
                                break;
@@ -2120,11 +2546,11 @@ public class StellarParser extends Parser {
                                _localctx = new ParenArithContext(_localctx);
                                enterOuterAlt(_localctx, 8);
                                {
-                               setState(264);
+                               setState(305);
                                match(LPAREN);
-                               setState(265);
+                               setState(306);
                                arithmetic_expr(0);
-                               setState(266);
+                               setState(307);
                                match(RPAREN);
                                }
                                break;
@@ -2132,11 +2558,11 @@ public class StellarParser extends Parser {
                                _localctx = new CondExprContext(_localctx);
                                enterOuterAlt(_localctx, 9);
                                {
-                               setState(268);
+                               setState(309);
                                match(LPAREN);
-                               setState(269);
+                               setState(310);
                                conditional_expr();
-                               setState(270);
+                               setState(311);
                                match(RPAREN);
                                }
                                break;
@@ -2319,16 +2745,16 @@ public class StellarParser extends Parser {
 
        public final Identifier_operandContext identifier_operand() throws 
RecognitionException {
                Identifier_operandContext _localctx = new 
Identifier_operandContext(_ctx, getState());
-               enterRule(_localctx, 42, RULE_identifier_operand);
+               enterRule(_localctx, 48, RULE_identifier_operand);
                int _la;
                try {
-                       setState(291);
-                       switch ( 
getInterpreter().adaptivePredict(_input,21,_ctx) ) {
+                       setState(332);
+                       switch ( 
getInterpreter().adaptivePredict(_input,24,_ctx) ) {
                        case 1:
                                _localctx = new LogicalConstContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(274);
+                               setState(315);
                                _la = _input.LA(1);
                                if ( !(_la==TRUE || _la==FALSE) ) {
                                _errHandler.recoverInline(this);
@@ -2341,7 +2767,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
LambdaWithArgsExprContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(275);
+                               setState(316);
                                lambda_with_args();
                                }
                                break;
@@ -2349,7 +2775,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
LambdaWithoutArgsExprContext(_localctx);
                                enterOuterAlt(_localctx, 3);
                                {
-                               setState(276);
+                               setState(317);
                                lambda_without_args();
                                }
                                break;
@@ -2357,7 +2783,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
ArithmeticOperandsContext(_localctx);
                                enterOuterAlt(_localctx, 4);
                                {
-                               setState(277);
+                               setState(318);
                                arithmetic_expr(0);
                                }
                                break;
@@ -2365,7 +2791,7 @@ public class StellarParser extends Parser {
                                _localctx = new StringLiteralContext(_localctx);
                                enterOuterAlt(_localctx, 5);
                                {
-                               setState(278);
+                               setState(319);
                                match(STRING_LITERAL);
                                }
                                break;
@@ -2373,7 +2799,7 @@ public class StellarParser extends Parser {
                                _localctx = new ListContext(_localctx);
                                enterOuterAlt(_localctx, 6);
                                {
-                               setState(279);
+                               setState(320);
                                list_entity();
                                }
                                break;
@@ -2381,7 +2807,7 @@ public class StellarParser extends Parser {
                                _localctx = new MapConstContext(_localctx);
                                enterOuterAlt(_localctx, 7);
                                {
-                               setState(280);
+                               setState(321);
                                map_entity();
                                }
                                break;
@@ -2389,7 +2815,7 @@ public class StellarParser extends Parser {
                                _localctx = new NullConstContext(_localctx);
                                enterOuterAlt(_localctx, 8);
                                {
-                               setState(281);
+                               setState(322);
                                match(NULL);
                                }
                                break;
@@ -2397,13 +2823,13 @@ public class StellarParser extends Parser {
                                _localctx = new ExistsFuncContext(_localctx);
                                enterOuterAlt(_localctx, 9);
                                {
-                               setState(282);
+                               setState(323);
                                match(EXISTS);
-                               setState(283);
+                               setState(324);
                                match(LPAREN);
-                               setState(284);
+                               setState(325);
                                match(IDENTIFIER);
-                               setState(285);
+                               setState(326);
                                match(RPAREN);
                                }
                                break;
@@ -2411,11 +2837,11 @@ public class StellarParser extends Parser {
                                _localctx = new 
CondExpr_parenContext(_localctx);
                                enterOuterAlt(_localctx, 10);
                                {
-                               setState(286);
+                               setState(327);
                                match(LPAREN);
-                               setState(287);
+                               setState(328);
                                conditional_expr();
-                               setState(288);
+                               setState(329);
                                match(RPAREN);
                                }
                                break;
@@ -2423,7 +2849,7 @@ public class StellarParser extends Parser {
                                _localctx = new FuncContext(_localctx);
                                enterOuterAlt(_localctx, 11);
                                {
-                               setState(290);
+                               setState(331);
                                functions();
                                }
                                break;
@@ -2466,12 +2892,12 @@ public class StellarParser extends Parser {
 
        public final Default_operandContext default_operand() throws 
RecognitionException {
                Default_operandContext _localctx = new 
Default_operandContext(_ctx, getState());
-               enterRule(_localctx, 44, RULE_default_operand);
+               enterRule(_localctx, 50, RULE_default_operand);
                try {
                        _localctx = new DefaultContext(_localctx);
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(293);
+                       setState(334);
                        match(DEFAULT);
                        }
                }
@@ -2509,17 +2935,17 @@ public class StellarParser extends Parser {
 
        public final Lambda_without_argsContext lambda_without_args() throws 
RecognitionException {
                Lambda_without_argsContext _localctx = new 
Lambda_without_argsContext(_ctx, getState());
-               enterRule(_localctx, 46, RULE_lambda_without_args);
+               enterRule(_localctx, 52, RULE_lambda_without_args);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(295);
+                       setState(336);
                        match(LPAREN);
-                       setState(296);
+                       setState(337);
                        match(RPAREN);
-                       setState(297);
+                       setState(338);
                        match(LAMBDA_OP);
-                       setState(298);
+                       setState(339);
                        transformation_expr();
                        }
                }
@@ -2563,33 +2989,33 @@ public class StellarParser extends Parser {
 
        public final Lambda_with_argsContext lambda_with_args() throws 
RecognitionException {
                Lambda_with_argsContext _localctx = new 
Lambda_with_argsContext(_ctx, getState());
-               enterRule(_localctx, 48, RULE_lambda_with_args);
+               enterRule(_localctx, 54, RULE_lambda_with_args);
                try {
-                       setState(310);
+                       setState(351);
                        switch (_input.LA(1)) {
                        case LPAREN:
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(300);
+                               setState(341);
                                match(LPAREN);
-                               setState(301);
+                               setState(342);
                                lambda_variables();
-                               setState(302);
+                               setState(343);
                                match(RPAREN);
-                               setState(303);
+                               setState(344);
                                match(LAMBDA_OP);
-                               setState(304);
+                               setState(345);
                                transformation_expr();
                                }
                                break;
                        case IDENTIFIER:
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(306);
+                               setState(347);
                                single_lambda_variable();
-                               setState(307);
+                               setState(348);
                                match(LAMBDA_OP);
-                               setState(308);
+                               setState(349);
                                transformation_expr();
                                }
                                break;
@@ -2635,26 +3061,26 @@ public class StellarParser extends Parser {
 
        public final Lambda_variablesContext lambda_variables() throws 
RecognitionException {
                Lambda_variablesContext _localctx = new 
Lambda_variablesContext(_ctx, getState());
-               enterRule(_localctx, 50, RULE_lambda_variables);
+               enterRule(_localctx, 56, RULE_lambda_variables);
                int _la;
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(312);
+                       setState(353);
                        lambda_variable();
-                       setState(317);
+                       setState(358);
                        _errHandler.sync(this);
                        _la = _input.LA(1);
                        while (_la==COMMA) {
                                {
                                {
-                               setState(313);
+                               setState(354);
                                match(COMMA);
-                               setState(314);
+                               setState(355);
                                lambda_variable();
                                }
                                }
-                               setState(319);
+                               setState(360);
                                _errHandler.sync(this);
                                _la = _input.LA(1);
                        }
@@ -2691,11 +3117,11 @@ public class StellarParser extends Parser {
 
        public final Single_lambda_variableContext single_lambda_variable() 
throws RecognitionException {
                Single_lambda_variableContext _localctx = new 
Single_lambda_variableContext(_ctx, getState());
-               enterRule(_localctx, 52, RULE_single_lambda_variable);
+               enterRule(_localctx, 58, RULE_single_lambda_variable);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(320);
+                       setState(361);
                        lambda_variable();
                        }
                }
@@ -2728,11 +3154,11 @@ public class StellarParser extends Parser {
 
        public final Lambda_variableContext lambda_variable() throws 
RecognitionException {
                Lambda_variableContext _localctx = new 
Lambda_variableContext(_ctx, getState());
-               enterRule(_localctx, 54, RULE_lambda_variable);
+               enterRule(_localctx, 60, RULE_lambda_variable);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(322);
+                       setState(363);
                        match(IDENTIFIER);
                        }
                }
@@ -2784,26 +3210,26 @@ public class StellarParser extends Parser {
 
        public final Match_exprContext match_expr() throws RecognitionException 
{
                Match_exprContext _localctx = new Match_exprContext(_ctx, 
getState());
-               enterRule(_localctx, 56, RULE_match_expr);
+               enterRule(_localctx, 62, RULE_match_expr);
                try {
                        _localctx = new MatchClausesContext(_localctx);
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(324);
+                       setState(365);
                        match(MATCH);
-                       setState(325);
+                       setState(366);
                        match(LBRACE);
-                       setState(326);
+                       setState(367);
                        match_clauses();
-                       setState(327);
+                       setState(368);
                        match(COMMA);
-                       setState(328);
+                       setState(369);
                        match(DEFAULT);
-                       setState(329);
+                       setState(370);
                        match(MATCH_ACTION);
-                       setState(330);
+                       setState(371);
                        match_clause_action();
-                       setState(331);
+                       setState(372);
                        match(RBRACE);
                        }
                }
@@ -2845,30 +3271,30 @@ public class StellarParser extends Parser {
 
        public final Match_clausesContext match_clauses() throws 
RecognitionException {
                Match_clausesContext _localctx = new Match_clausesContext(_ctx, 
getState());
-               enterRule(_localctx, 58, RULE_match_clauses);
+               enterRule(_localctx, 64, RULE_match_clauses);
                try {
                        int _alt;
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(333);
+                       setState(374);
                        match_clause();
-                       setState(338);
+                       setState(379);
                        _errHandler.sync(this);
-                       _alt = getInterpreter().adaptivePredict(_input,24,_ctx);
+                       _alt = getInterpreter().adaptivePredict(_input,27,_ctx);
                        while ( _alt!=2 && 
_alt!=org.antlr.v4.runtime.atn.ATN.INVALID_ALT_NUMBER ) {
                                if ( _alt==1 ) {
                                        {
                                        {
-                                       setState(334);
+                                       setState(375);
                                        match(COMMA);
-                                       setState(335);
+                                       setState(376);
                                        match_clause();
                                        }
                                        } 
                                }
-                               setState(340);
+                               setState(381);
                                _errHandler.sync(this);
-                               _alt = 
getInterpreter().adaptivePredict(_input,24,_ctx);
+                               _alt = 
getInterpreter().adaptivePredict(_input,27,_ctx);
                        }
                        }
                }
@@ -2907,15 +3333,15 @@ public class StellarParser extends Parser {
 
        public final Match_clauseContext match_clause() throws 
RecognitionException {
                Match_clauseContext _localctx = new Match_clauseContext(_ctx, 
getState());
-               enterRule(_localctx, 60, RULE_match_clause);
+               enterRule(_localctx, 66, RULE_match_clause);
                try {
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(341);
+                       setState(382);
                        match_clause_check();
-                       setState(342);
+                       setState(383);
                        match(MATCH_ACTION);
-                       setState(343);
+                       setState(384);
                        match_clause_action();
                        }
                }
@@ -2958,12 +3384,12 @@ public class StellarParser extends Parser {
 
        public final Match_clause_actionContext match_clause_action() throws 
RecognitionException {
                Match_clause_actionContext _localctx = new 
Match_clause_actionContext(_ctx, getState());
-               enterRule(_localctx, 62, RULE_match_clause_action);
+               enterRule(_localctx, 68, RULE_match_clause_action);
                try {
                        _localctx = new MatchClauseActionContext(_localctx);
                        enterOuterAlt(_localctx, 1);
                        {
-                       setState(345);
+                       setState(386);
                        transformation_expr();
                        }
                }
@@ -3009,15 +3435,15 @@ public class StellarParser extends Parser {
 
        public final Match_clause_checkContext match_clause_check() throws 
RecognitionException {
                Match_clause_checkContext _localctx = new 
Match_clause_checkContext(_ctx, getState());
-               enterRule(_localctx, 64, RULE_match_clause_check);
+               enterRule(_localctx, 70, RULE_match_clause_check);
                try {
-                       setState(349);
-                       switch ( 
getInterpreter().adaptivePredict(_input,25,_ctx) ) {
+                       setState(390);
+                       switch ( 
getInterpreter().adaptivePredict(_input,28,_ctx) ) {
                        case 1:
                                _localctx = new 
MatchClauseCheckExprContext(_localctx);
                                enterOuterAlt(_localctx, 1);
                                {
-                               setState(347);
+                               setState(388);
                                logical_expr();
                                }
                                break;
@@ -3025,7 +3451,7 @@ public class StellarParser extends Parser {
                                _localctx = new 
MatchClauseCheckExprContext(_localctx);
                                enterOuterAlt(_localctx, 2);
                                {
-                               setState(348);
+                               setState(389);
                                conditional_expr();
                                }
                                break;
@@ -3044,15 +3470,15 @@ public class StellarParser extends Parser {
 
        public boolean sempred(RuleContext _localctx, int ruleIndex, int 
predIndex) {
                switch (ruleIndex) {
-               case 9:
+               case 12:
                        return 
comparison_expr_sempred((Comparison_exprContext)_localctx, predIndex);
-               case 13:
+               case 16:
                        return op_list_sempred((Op_listContext)_localctx, 
predIndex);
-               case 15:
+               case 18:
                        return kv_list_sempred((Kv_listContext)_localctx, 
predIndex);
-               case 17:
+               case 20:
                        return 
arithmetic_expr_sempred((Arithmetic_exprContext)_localctx, predIndex);
-               case 18:
+               case 21:
                        return 
arithmetic_expr_mul_sempred((Arithmetic_expr_mulContext)_localctx, predIndex);
                }
                return true;
@@ -3104,128 +3530,144 @@ public class StellarParser extends Parser {
        }
 
        public static final String _serializedATN =
-               
"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3\62\u0162\4\2\t\2"+
-               
"\4\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13"+
-               
"\t\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
+               
"\3\u0430\ud6d1\u8206\uad2d\u4417\uaef1\u8d80\uaadd\3:\u018b\4\2\t\2\4"+
+               
"\3\t\3\4\4\t\4\4\5\t\5\4\6\t\6\4\7\t\7\4\b\t\b\4\t\t\t\4\n\t\n\4\13\t"+
+               
"\13\4\f\t\f\4\r\t\r\4\16\t\16\4\17\t\17\4\20\t\20\4\21\t\21\4\22\t\22"+
                
"\4\23\t\23\4\24\t\24\4\25\t\25\4\26\t\26\4\27\t\27\4\30\t\30\4\31\t\31"+
                "\4\32\t\32\4\33\t\33\4\34\t\34\4\35\t\35\4\36\t\36\4\37\t\37\4 
\t \4!"+
-               
"\t!\4\"\t\"\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\3\5"+
-               
"\3S\n\3\3\4\3\4\3\5\3\5\3\6\3\6\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3\7\3"+
-               
"\7\3\7\3\7\3\7\5\7h\n\7\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\3\b\5\bs\n\b\3"+
-               
"\t\3\t\5\tw\n\t\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\5\n\u0081\n\n\3\13\3\13"+
-               
"\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\3\13\5\13\u008e\n\13\3\13\3\13"+
-               
"\3\13\3\13\7\13\u0094\n\13\f\13\16\13\u0097\13\13\3\f\3\f\3\r\3\r\3\16"+
-               
"\3\16\3\16\3\16\3\16\3\16\5\16\u00a3\n\16\3\17\3\17\3\17\3\17\5\17\u00a9"+
-               
"\n\17\3\17\3\17\3\17\3\17\3\17\3\17\3\17\3\17\3\17\7\17\u00b4\n\17\f\17"+
-               
"\16\17\u00b7\13\17\3\20\3\20\3\20\3\20\3\20\3\20\5\20\u00bf\n\20\3\21"+
-               
"\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\5\21\u00ca\n\21\3\21\3\21\3\21"+
-               
"\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\3\21\7\21\u00d8\n\21\f\21\16"+
-               
"\21\u00db\13\21\3\22\3\22\3\22\3\22\3\22\3\22\5\22\u00e3\n\22\3\23\3\23"+
-               
"\3\23\3\23\3\23\3\23\3\23\3\23\3\23\7\23\u00ee\n\23\f\23\16\23\u00f1\13"+
-               
"\23\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\3\24\7\24\u00fc\n\24\f\24"+
-               
"\16\24\u00ff\13\24\3\25\3\25\3\25\3\26\3\26\3\26\3\26\3\26\3\26\3\26\3"+
-               
"\26\3\26\3\26\3\26\3\26\3\26\3\26\3\26\5\26\u0113\n\26\3\27\3\27\3\27"+
-               
"\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27\3\27"+
-               
"\5\27\u0126\n\27\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\32\3\32\3\32\3\32"+
-               
"\3\32\3\32\3\32\3\32\3\32\3\32\5\32\u0139\n\32\3\33\3\33\3\33\7\33\u013e"+
-               
"\n\33\f\33\16\33\u0141\13\33\3\34\3\34\3\35\3\35\3\36\3\36\3\36\3\36\3"+
-               
"\36\3\36\3\36\3\36\3\36\3\37\3\37\3\37\7\37\u0153\n\37\f\37\16\37\u0156"+
-               "\13\37\3 \3 \3 \3 \3!\3!\3\"\3\"\5\"\u0160\n\"\3\"\2\7\24\34 
$&#\2\4\6"+
-               "\b\n\f\16\20\22\24\26\30\32\34\36 
\"$&(*,.\60\62\64\668:<>@B\2\4\3\2\16"+
-               
"\23\3\2\f\r\u0174\2D\3\2\2\2\4R\3\2\2\2\6T\3\2\2\2\bV\3\2\2\2\nX\3\2\2"+
-               
"\2\fg\3\2\2\2\16r\3\2\2\2\20v\3\2\2\2\22\u0080\3\2\2\2\24\u008d\3\2\2"+
-               
"\2\26\u0098\3\2\2\2\30\u009a\3\2\2\2\32\u00a2\3\2\2\2\34\u00a8\3\2\2\2"+
-               "\36\u00be\3\2\2\2 
\u00c9\3\2\2\2\"\u00e2\3\2\2\2$\u00e4\3\2\2\2&\u00f2"+
-               
"\3\2\2\2(\u0100\3\2\2\2*\u0112\3\2\2\2,\u0125\3\2\2\2.\u0127\3\2\2\2\60"+
-               
"\u0129\3\2\2\2\62\u0138\3\2\2\2\64\u013a\3\2\2\2\66\u0142\3\2\2\28\u0144"+
-               
"\3\2\2\2:\u0146\3\2\2\2<\u014f\3\2\2\2>\u0157\3\2\2\2@\u015b\3\2\2\2B"+
-               
"\u015f\3\2\2\2DE\5\4\3\2EF\7\2\2\3F\3\3\2\2\2GS\5\f\7\2HI\7&\2\2IJ\5\4"+
-               
"\3\2JK\7\'\2\2KS\3\2\2\2LS\5$\23\2MS\5\26\f\2NS\5\24\13\2OS\5\16\b\2P"+
-               
"S\5\22\n\2QS\5:\36\2RG\3\2\2\2RH\3\2\2\2RL\3\2\2\2RM\3\2\2\2RN\3\2\2\2"+
-               
"RO\3\2\2\2RP\3\2\2\2RQ\3\2\2\2S\5\3\2\2\2TU\5\16\b\2U\7\3\2\2\2VW\5\4"+
-               
"\3\2W\t\3\2\2\2XY\5\4\3\2Y\13\3\2\2\2Z[\5\6\4\2[\\\7\24\2\2\\]\5\b\5\2"+
-               
"]^\7\25\2\2^_\5\n\6\2_h\3\2\2\2`a\7\26\2\2ab\5\6\4\2bc\7\27\2\2cd\5\b"+
-               
"\5\2de\7\30\2\2ef\5\n\6\2fh\3\2\2\2gZ\3\2\2\2g`\3\2\2\2h\r\3\2\2\2ij\5"+
-               
"\20\t\2jk\7\t\2\2kl\5\16\b\2ls\3\2\2\2mn\5\20\t\2no\7\n\2\2op\5\16\b\2"+
-               
"ps\3\2\2\2qs\5\20\t\2ri\3\2\2\2rm\3\2\2\2rq\3\2\2\2s\17\3\2\2\2tw\5\24"+
-               
"\13\2uw\5\22\n\2vt\3\2\2\2vu\3\2\2\2w\21\3\2\2\2xy\5,\27\2yz\7\3\2\2z"+
-               
"{\5\20\t\2{\u0081\3\2\2\2|}\5,\27\2}~\7(\2\2~\177\5\20\t\2\177\u0081\3"+
-               
"\2\2\2\u0080x\3\2\2\2\u0080|\3\2\2\2\u0081\23\3\2\2\2\u0082\u0083\b\13"+
-               
"\1\2\u0083\u0084\7\13\2\2\u0084\u0085\7&\2\2\u0085\u0086\5\16\b\2\u0086"+
-               
"\u0087\7\'\2\2\u0087\u008e\3\2\2\2\u0088\u0089\7&\2\2\u0089\u008a\5\16"+
-               
"\b\2\u008a\u008b\7\'\2\2\u008b\u008e\3\2\2\2\u008c\u008e\5,\27\2\u008d"+
-               
"\u0082\3\2\2\2\u008d\u0088\3\2\2\2\u008d\u008c\3\2\2\2\u008e\u0095\3\2"+
-               
"\2\2\u008f\u0090\f\6\2\2\u0090\u0091\5\30\r\2\u0091\u0092\5\24\13\7\u0092"+
-               
"\u0094\3\2\2\2\u0093\u008f\3\2\2\2\u0094\u0097\3\2\2\2\u0095\u0093\3\2"+
-               
"\2\2\u0095\u0096\3\2\2\2\u0096\25\3\2\2\2\u0097\u0095\3\2\2\2\u0098\u0099"+
-               
"\5,\27\2\u0099\27\3\2\2\2\u009a\u009b\t\2\2\2\u009b\31\3\2\2\2\u009c\u009d"+
-               
"\7&\2\2\u009d\u009e\5\34\17\2\u009e\u009f\7\'\2\2\u009f\u00a3\3\2\2\2"+
-               
"\u00a0\u00a1\7&\2\2\u00a1\u00a3\7\'\2\2\u00a2\u009c\3\2\2\2\u00a2\u00a0"+
-               
"\3\2\2\2\u00a3\33\3\2\2\2\u00a4\u00a5\b\17\1\2\u00a5\u00a9\5,\27\2\u00a6"+
-               
"\u00a9\5\f\7\2\u00a7\u00a9\5\24\13\2\u00a8\u00a4\3\2\2\2\u00a8\u00a6\3"+
-               
"\2\2\2\u00a8\u00a7\3\2\2\2\u00a9\u00b5\3\2\2\2\u00aa\u00ab\f\7\2\2\u00ab"+
-               
"\u00ac\7\7\2\2\u00ac\u00b4\5,\27\2\u00ad\u00ae\f\5\2\2\u00ae\u00af\7\7"+
-               
"\2\2\u00af\u00b4\5\f\7\2\u00b0\u00b1\f\3\2\2\u00b1\u00b2\7\7\2\2\u00b2"+
-               
"\u00b4\5\24\13\2\u00b3\u00aa\3\2\2\2\u00b3\u00ad\3\2\2\2\u00b3\u00b0\3"+
-               
"\2\2\2\u00b4\u00b7\3\2\2\2\u00b5\u00b3\3\2\2\2\u00b5\u00b6\3\2\2\2\u00b6"+
-               
"\35\3\2\2\2\u00b7\u00b5\3\2\2\2\u00b8\u00b9\7$\2\2\u00b9\u00bf\7%\2\2"+
-               
"\u00ba\u00bb\7$\2\2\u00bb\u00bc\5\34\17\2\u00bc\u00bd\7%\2\2\u00bd\u00bf"+
-               
"\3\2\2\2\u00be\u00b8\3\2\2\2\u00be\u00ba\3\2\2\2\u00bf\37\3\2\2\2\u00c0"+
-               
"\u00c1\b\21\1\2\u00c1\u00c2\5,\27\2\u00c2\u00c3\7\25\2\2\u00c3\u00c4\5"+
-               
"\4\3\2\u00c4\u00ca\3\2\2\2\u00c5\u00c6\5\24\13\2\u00c6\u00c7\7\25\2\2"+
-               
"\u00c7\u00c8\5\4\3\2\u00c8\u00ca\3\2\2\2\u00c9\u00c0\3\2\2\2\u00c9\u00c5"+
-               
"\3\2\2\2\u00ca\u00d9\3\2\2\2\u00cb\u00cc\f\4\2\2\u00cc\u00cd\7\7\2\2\u00cd"+
-               
"\u00ce\5,\27\2\u00ce\u00cf\7\25\2\2\u00cf\u00d0\5\4\3\2\u00d0\u00d8\3"+
-               
"\2\2\2\u00d1\u00d2\f\3\2\2\u00d2\u00d3\7\7\2\2\u00d3\u00d4\5\24\13\2\u00d4"+
-               
"\u00d5\7\25\2\2\u00d5\u00d6\5\4\3\2\u00d6\u00d8\3\2\2\2\u00d7\u00cb\3"+
-               
"\2\2\2\u00d7\u00d1\3\2\2\2\u00d8\u00db\3\2\2\2\u00d9\u00d7\3\2\2\2\u00d9"+
-               
"\u00da\3\2\2\2\u00da!\3\2\2\2\u00db\u00d9\3\2\2\2\u00dc\u00dd\7\"\2\2"+
-               "\u00dd\u00de\5 
\21\2\u00de\u00df\7#\2\2\u00df\u00e3\3\2\2\2\u00e0\u00e1"+
-               
"\7\"\2\2\u00e1\u00e3\7#\2\2\u00e2\u00dc\3\2\2\2\u00e2\u00e0\3\2\2\2\u00e3"+
-               
"#\3\2\2\2\u00e4\u00e5\b\23\1\2\u00e5\u00e6\5&\24\2\u00e6\u00ef\3\2\2\2"+
-               
"\u00e7\u00e8\f\4\2\2\u00e8\u00e9\7\37\2\2\u00e9\u00ee\5&\24\2\u00ea\u00eb"+
-               
"\f\3\2\2\u00eb\u00ec\7\36\2\2\u00ec\u00ee\5&\24\2\u00ed\u00e7\3\2\2\2"+
-               
"\u00ed\u00ea\3\2\2\2\u00ee\u00f1\3\2\2\2\u00ef\u00ed\3\2\2\2\u00ef\u00f0"+
-               
"\3\2\2\2\u00f0%\3\2\2\2\u00f1\u00ef\3\2\2\2\u00f2\u00f3\b\24\1\2\u00f3"+
-               
"\u00f4\5*\26\2\u00f4\u00fd\3\2\2\2\u00f5\u00f6\f\4\2\2\u00f6\u00f7\7!"+
-               "\2\2\u00f7\u00fc\5&\24\5\u00f8\u00f9\f\3\2\2\u00f9\u00fa\7 
\2\2\u00fa"+
-               
"\u00fc\5&\24\4\u00fb\u00f5\3\2\2\2\u00fb\u00f8\3\2\2\2\u00fc\u00ff\3\2"+
-               
"\2\2\u00fd\u00fb\3\2\2\2\u00fd\u00fe\3\2\2\2\u00fe\'\3\2\2\2\u00ff\u00fd"+
-               
"\3\2\2\2\u0100\u0101\7/\2\2\u0101\u0102\5\32\16\2\u0102)\3\2\2\2\u0103"+
-               
"\u0113\5(\25\2\u0104\u0113\7,\2\2\u0105\u0113\7+\2\2\u0106\u0113\7.\2"+
-               
"\2\u0107\u0113\7-\2\2\u0108\u0113\7/\2\2\u0109\u0113\7\32\2\2\u010a\u010b"+
-               
"\7&\2\2\u010b\u010c\5$\23\2\u010c\u010d\7\'\2\2\u010d\u0113\3\2\2\2\u010e"+
-               
"\u010f\7&\2\2\u010f\u0110\5\f\7\2\u0110\u0111\7\'\2\2\u0111\u0113\3\2"+
-               
"\2\2\u0112\u0103\3\2\2\2\u0112\u0104\3\2\2\2\u0112\u0105\3\2\2\2\u0112"+
-               
"\u0106\3\2\2\2\u0112\u0107\3\2\2\2\u0112\u0108\3\2\2\2\u0112\u0109\3\2"+
-               
"\2\2\u0112\u010a\3\2\2\2\u0112\u010e\3\2\2\2\u0113+\3\2\2\2\u0114\u0126"+
-               
"\t\3\2\2\u0115\u0126\5\62\32\2\u0116\u0126\5\60\31\2\u0117\u0126\5$\23"+
-               
"\2\u0118\u0126\7\60\2\2\u0119\u0126\5\36\20\2\u011a\u0126\5\"\22\2\u011b"+
-               
"\u0126\7\31\2\2\u011c\u011d\7)\2\2\u011d\u011e\7&\2\2\u011e\u011f\7/\2"+
-               
"\2\u011f\u0126\7\'\2\2\u0120\u0121\7&\2\2\u0121\u0122\5\f\7\2\u0122\u0123"+
-               
"\7\'\2\2\u0123\u0126\3\2\2\2\u0124\u0126\5(\25\2\u0125\u0114\3\2\2\2\u0125"+
-               
"\u0115\3\2\2\2\u0125\u0116\3\2\2\2\u0125\u0117\3\2\2\2\u0125\u0118\3\2"+
-               
"\2\2\u0125\u0119\3\2\2\2\u0125\u011a\3\2\2\2\u0125\u011b\3\2\2\2\u0125"+
-               
"\u011c\3\2\2\2\u0125\u0120\3\2\2\2\u0125\u0124\3\2\2\2\u0126-\3\2\2\2"+
-               
"\u0127\u0128\7\34\2\2\u0128/\3\2\2\2\u0129\u012a\7&\2\2\u012a\u012b\7"+
-               
"\'\2\2\u012b\u012c\7\4\2\2\u012c\u012d\5\4\3\2\u012d\61\3\2\2\2\u012e"+
-               
"\u012f\7&\2\2\u012f\u0130\5\64\33\2\u0130\u0131\7\'\2\2\u0131\u0132\7"+
-               
"\4\2\2\u0132\u0133\5\4\3\2\u0133\u0139\3\2\2\2\u0134\u0135\5\66\34\2\u0135"+
-               
"\u0136\7\4\2\2\u0136\u0137\5\4\3\2\u0137\u0139\3\2\2\2\u0138\u012e\3\2"+
-               
"\2\2\u0138\u0134\3\2\2\2\u0139\63\3\2\2\2\u013a\u013f\58\35\2\u013b\u013c"+
-               
"\7\7\2\2\u013c\u013e\58\35\2\u013d\u013b\3\2\2\2\u013e\u0141\3\2\2\2\u013f"+
-               
"\u013d\3\2\2\2\u013f\u0140\3\2\2\2\u0140\65\3\2\2\2\u0141\u013f\3\2\2"+
-               
"\2\u0142\u0143\58\35\2\u0143\67\3\2\2\2\u0144\u0145\7/\2\2\u01459\3\2"+
-               
"\2\2\u0146\u0147\7\33\2\2\u0147\u0148\7\"\2\2\u0148\u0149\5<\37\2\u0149"+
-               
"\u014a\7\7\2\2\u014a\u014b\7\34\2\2\u014b\u014c\7\35\2\2\u014c\u014d\5"+
-               "@!\2\u014d\u014e\7#\2\2\u014e;\3\2\2\2\u014f\u0154\5> 
\2\u0150\u0151\7"+
-               "\7\2\2\u0151\u0153\5> 
\2\u0152\u0150\3\2\2\2\u0153\u0156\3\2\2\2\u0154"+
-               
"\u0152\3\2\2\2\u0154\u0155\3\2\2\2\u0155=\3\2\2\2\u0156\u0154\3\2\2\2"+
-               
"\u0157\u0158\5B\"\2\u0158\u0159\7\35\2\2\u0159\u015a\5@!\2\u015a?\3\2"+
-               
"\2\2\u015b\u015c\5\4\3\2\u015cA\3\2\2\2\u015d\u0160\5\16\b\2\u015e\u0160"+
-               
"\5\f\7\2\u015f\u015d\3\2\2\2\u015f\u015e\3\2\2\2\u0160C\3\2\2\2\34Rgr"+
-               
"v\u0080\u008d\u0095\u00a2\u00a8\u00b3\u00b5\u00be\u00c9\u00d7\u00d9\u00e2"+
-               "\u00ed\u00ef\u00fb\u00fd\u0112\u0125\u0138\u013f\u0154\u015f";
+               
"\t!\4\"\t\"\4#\t#\4$\t$\4%\t%\3\2\3\2\3\2\3\3\3\3\3\3\3\3\3\3\3\3\3\3"+
+               
"\3\3\3\3\3\3\3\3\3\3\3\3\3\3\5\3\\\n\3\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4"+
+               
"\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\3\4\5\4p\n\4\3\5\3\5\3\5\3\5\5\5"+
+               
"v\n\5\3\6\3\6\3\6\3\6\5\6|\n\6\3\7\3\7\3\b\3\b\3\t\3\t\3\n\3\n\3\n\3\n"+
+               
"\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\3\n\5\n\u0091\n\n\3\13\3\13\3\13\3\13"+
+               
"\3\13\3\13\3\13\3\13\3\13\5\13\u009c\n\13\3\f\3\f\5\f\u00a0\n\f\3\r\3"+
+               
"\r\3\r\3\r\3\r\3\r\3\r\3\r\5\r\u00aa\n\r\3\16\3\16\3\16\3\16\3\16\3\16"+
+               
"\3\16\3\16\3\16\3\16\3\16\5\16\u00b7\n\16\3\16\3\16\3\16\3\16\7\16\u00bd"+
+               
"\n\16\f\16\16\16\u00c0\13\16\3\17\3\17\3\20\3\20\3\21\3\21\3\21\3\21\3"+
+               
"\21\3\21\5\21\u00cc\n\21\3\22\3\22\3\22\3\22\5\22\u00d2\n\22\3\22\3\22"+
+               
"\3\22\3\22\3\22\3\22\3\22\3\22\3\22\7\22\u00dd\n\22\f\22\16\22\u00e0\13"+
+               
"\22\3\23\3\23\3\23\3\23\3\23\3\23\5\23\u00e8\n\23\3\24\3\24\3\24\3\24"+
+               
"\3\24\3\24\3\24\3\24\3\24\5\24\u00f3\n\24\3\24\3\24\3\24\3\24\3\24\3\24"+
+               
"\3\24\3\24\3\24\3\24\3\24\3\24\7\24\u0101\n\24\f\24\16\24\u0104\13\24"+
+               
"\3\25\3\25\3\25\3\25\3\25\3\25\5\25\u010c\n\25\3\26\3\26\3\26\3\26\3\26"+
+               
"\3\26\3\26\3\26\3\26\7\26\u0117\n\26\f\26\16\26\u011a\13\26\3\27\3\27"+
+               
"\3\27\3\27\3\27\3\27\3\27\3\27\3\27\7\27\u0125\n\27\f\27\16\27\u0128\13"+
+               
"\27\3\30\3\30\3\30\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3\31\3"+
+               
"\31\3\31\3\31\3\31\3\31\5\31\u013c\n\31\3\32\3\32\3\32\3\32\3\32\3\32"+
+               
"\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\3\32\5\32\u014f\n\32"+
+               
"\3\33\3\33\3\34\3\34\3\34\3\34\3\34\3\35\3\35\3\35\3\35\3\35\3\35\3\35"+
+               
"\3\35\3\35\3\35\5\35\u0162\n\35\3\36\3\36\3\36\7\36\u0167\n\36\f\36\16"+
+               "\36\u016a\13\36\3\37\3\37\3 \3 
\3!\3!\3!\3!\3!\3!\3!\3!\3!\3\"\3\"\3\""+
+               
"\7\"\u017c\n\"\f\"\16\"\u017f\13\"\3#\3#\3#\3#\3$\3$\3%\3%\5%\u0189\n"+
+               "%\3%\2\7\32\"&*,&\2\4\6\b\n\f\16\20\22\24\26\30\32\34\36 
\"$&(*,.\60\62"+
+               
"\64\668:<>@BDFH\2\4\3\2\24\31\3\2\f\r\u01a4\2J\3\2\2\2\4[\3\2\2\2\6o\3"+
+               
"\2\2\2\bu\3\2\2\2\n{\3\2\2\2\f}\3\2\2\2\16\177\3\2\2\2\20\u0081\3\2\2"+
+               
"\2\22\u0090\3\2\2\2\24\u009b\3\2\2\2\26\u009f\3\2\2\2\30\u00a9\3\2\2\2"+
+               "\32\u00b6\3\2\2\2\34\u00c1\3\2\2\2\36\u00c3\3\2\2\2 
\u00cb\3\2\2\2\"\u00d1"+
+               
"\3\2\2\2$\u00e7\3\2\2\2&\u00f2\3\2\2\2(\u010b\3\2\2\2*\u010d\3\2\2\2,"+
+               
"\u011b\3\2\2\2.\u0129\3\2\2\2\60\u013b\3\2\2\2\62\u014e\3\2\2\2\64\u0150"+
+               
"\3\2\2\2\66\u0152\3\2\2\28\u0161\3\2\2\2:\u0163\3\2\2\2<\u016b\3\2\2\2"+
+               
">\u016d\3\2\2\2@\u016f\3\2\2\2B\u0178\3\2\2\2D\u0180\3\2\2\2F\u0184\3"+
+               
"\2\2\2H\u0188\3\2\2\2JK\5\4\3\2KL\7\2\2\3L\3\3\2\2\2M\\\5\22\n\2NO\7."+
+               
"\2\2OP\5\4\3\2PQ\7/\2\2Q\\\3\2\2\2R\\\5*\26\2S\\\5\34\17\2T\\\5\32\16"+
+               
"\2U\\\5\24\13\2V\\\5\30\r\2W\\\5@!\2X\\\5\6\4\2Y\\\5\b\5\2Z\\\5\n\6\2"+
+               
"[M\3\2\2\2[N\3\2\2\2[R\3\2\2\2[S\3\2\2\2[T\3\2\2\2[U\3\2\2\2[V\3\2\2\2"+
+               
"[W\3\2\2\2[X\3\2\2\2[Y\3\2\2\2[Z\3\2\2\2\\\5\3\2\2\2]^\7\67\2\2^_\7\16"+
+               
"\2\2_p\5\4\3\2`a\7\67\2\2ab\7\17\2\2bp\5\4\3\2cd\7\67\2\2de\7\20\2\2e"+
+               
"p\5\4\3\2fg\7\67\2\2gh\7\21\2\2hp\5\4\3\2ij\7\67\2\2jk\7\22\2\2kp\5\4"+
+               
"\3\2lm\7\67\2\2mn\7\23\2\2np\5\4\3\2o]\3\2\2\2o`\3\2\2\2oc\3\2\2\2of\3"+
+               
"\2\2\2oi\3\2\2\2ol\3\2\2\2p\7\3\2\2\2qr\7\'\2\2rv\7\67\2\2st\7%\2\2tv"+
+               
"\7\67\2\2uq\3\2\2\2us\3\2\2\2v\t\3\2\2\2wx\7\67\2\2x|\7\'\2\2yz\7\67\2"+
+               
"\2z|\7%\2\2{w\3\2\2\2{y\3\2\2\2|\13\3\2\2\2}~\5\24\13\2~\r\3\2\2\2\177"+
+               
"\u0080\5\4\3\2\u0080\17\3\2\2\2\u0081\u0082\5\4\3\2\u0082\21\3\2\2\2\u0083"+
+               
"\u0084\5\f\7\2\u0084\u0085\7\32\2\2\u0085\u0086\5\16\b\2\u0086\u0087\7"+
+               
"\33\2\2\u0087\u0088\5\20\t\2\u0088\u0091\3\2\2\2\u0089\u008a\7\34\2\2"+
+               
"\u008a\u008b\5\f\7\2\u008b\u008c\7\35\2\2\u008c\u008d\5\16\b\2\u008d\u008e"+
+               
"\7\36\2\2\u008e\u008f\5\20\t\2\u008f\u0091\3\2\2\2\u0090\u0083\3\2\2\2"+
+               
"\u0090\u0089\3\2\2\2\u0091\23\3\2\2\2\u0092\u0093\5\26\f\2\u0093\u0094"+
+               
"\7\t\2\2\u0094\u0095\5\24\13\2\u0095\u009c\3\2\2\2\u0096\u0097\5\26\f"+
+               
"\2\u0097\u0098\7\n\2\2\u0098\u0099\5\24\13\2\u0099\u009c\3\2\2\2\u009a"+
+               
"\u009c\5\26\f\2\u009b\u0092\3\2\2\2\u009b\u0096\3\2\2\2\u009b\u009a\3"+
+               
"\2\2\2\u009c\25\3\2\2\2\u009d\u00a0\5\32\16\2\u009e\u00a0\5\30\r\2\u009f"+
+               
"\u009d\3\2\2\2\u009f\u009e\3\2\2\2\u00a0\27\3\2\2\2\u00a1\u00a2\5\62\32"+
+               
"\2\u00a2\u00a3\7\3\2\2\u00a3\u00a4\5\26\f\2\u00a4\u00aa\3\2\2\2\u00a5"+
+               
"\u00a6\5\62\32\2\u00a6\u00a7\7\60\2\2\u00a7\u00a8\5\26\f\2\u00a8\u00aa"+
+               
"\3\2\2\2\u00a9\u00a1\3\2\2\2\u00a9\u00a5\3\2\2\2\u00aa\31\3\2\2\2\u00ab"+
+               
"\u00ac\b\16\1\2\u00ac\u00ad\7\13\2\2\u00ad\u00ae\7.\2\2\u00ae\u00af\5"+
+               
"\24\13\2\u00af\u00b0\7/\2\2\u00b0\u00b7\3\2\2\2\u00b1\u00b2\7.\2\2\u00b2"+
+               
"\u00b3\5\24\13\2\u00b3\u00b4\7/\2\2\u00b4\u00b7\3\2\2\2\u00b5\u00b7\5"+
+               
"\62\32\2\u00b6\u00ab\3\2\2\2\u00b6\u00b1\3\2\2\2\u00b6\u00b5\3\2\2\2\u00b7"+
+               
"\u00be\3\2\2\2\u00b8\u00b9\f\6\2\2\u00b9\u00ba\5\36\20\2\u00ba\u00bb\5"+
+               
"\32\16\7\u00bb\u00bd\3\2\2\2\u00bc\u00b8\3\2\2\2\u00bd\u00c0\3\2\2\2\u00be"+
+               
"\u00bc\3\2\2\2\u00be\u00bf\3\2\2\2\u00bf\33\3\2\2\2\u00c0\u00be\3\2\2"+
+               
"\2\u00c1\u00c2\5\62\32\2\u00c2\35\3\2\2\2\u00c3\u00c4\t\2\2\2\u00c4\37"+
+               
"\3\2\2\2\u00c5\u00c6\7.\2\2\u00c6\u00c7\5\"\22\2\u00c7\u00c8\7/\2\2\u00c8"+
+               
"\u00cc\3\2\2\2\u00c9\u00ca\7.\2\2\u00ca\u00cc\7/\2\2\u00cb\u00c5\3\2\2"+
+               
"\2\u00cb\u00c9\3\2\2\2\u00cc!\3\2\2\2\u00cd\u00ce\b\22\1\2\u00ce\u00d2"+
+               
"\5\62\32\2\u00cf\u00d2\5\22\n\2\u00d0\u00d2\5\32\16\2\u00d1\u00cd\3\2"+
+               
"\2\2\u00d1\u00cf\3\2\2\2\u00d1\u00d0\3\2\2\2\u00d2\u00de\3\2\2\2\u00d3"+
+               
"\u00d4\f\7\2\2\u00d4\u00d5\7\7\2\2\u00d5\u00dd\5\62\32\2\u00d6\u00d7\f"+
+               
"\5\2\2\u00d7\u00d8\7\7\2\2\u00d8\u00dd\5\22\n\2\u00d9\u00da\f\3\2\2\u00da"+
+               
"\u00db\7\7\2\2\u00db\u00dd\5\32\16\2\u00dc\u00d3\3\2\2\2\u00dc\u00d6\3"+
+               
"\2\2\2\u00dc\u00d9\3\2\2\2\u00dd\u00e0\3\2\2\2\u00de\u00dc\3\2\2\2\u00de"+
+               
"\u00df\3\2\2\2\u00df#\3\2\2\2\u00e0\u00de\3\2\2\2\u00e1\u00e2\7,\2\2\u00e2"+
+               
"\u00e8\7-\2\2\u00e3\u00e4\7,\2\2\u00e4\u00e5\5\"\22\2\u00e5\u00e6\7-\2"+
+               
"\2\u00e6\u00e8\3\2\2\2\u00e7\u00e1\3\2\2\2\u00e7\u00e3\3\2\2\2\u00e8%"+
+               
"\3\2\2\2\u00e9\u00ea\b\24\1\2\u00ea\u00eb\5\62\32\2\u00eb\u00ec\7\33\2"+
+               
"\2\u00ec\u00ed\5\4\3\2\u00ed\u00f3\3\2\2\2\u00ee\u00ef\5\32\16\2\u00ef"+
+               
"\u00f0\7\33\2\2\u00f0\u00f1\5\4\3\2\u00f1\u00f3\3\2\2\2\u00f2\u00e9\3"+
+               
"\2\2\2\u00f2\u00ee\3\2\2\2\u00f3\u0102\3\2\2\2\u00f4\u00f5\f\4\2\2\u00f5"+
+               
"\u00f6\7\7\2\2\u00f6\u00f7\5\62\32\2\u00f7\u00f8\7\33\2\2\u00f8\u00f9"+
+               
"\5\4\3\2\u00f9\u0101\3\2\2\2\u00fa\u00fb\f\3\2\2\u00fb\u00fc\7\7\2\2\u00fc"+
+               
"\u00fd\5\32\16\2\u00fd\u00fe\7\33\2\2\u00fe\u00ff\5\4\3\2\u00ff\u0101"+
+               
"\3\2\2\2\u0100\u00f4\3\2\2\2\u0100\u00fa\3\2\2\2\u0101\u0104\3\2\2\2\u0102"+
+               
"\u0100\3\2\2\2\u0102\u0103\3\2\2\2\u0103\'\3\2\2\2\u0104\u0102\3\2\2\2"+
+               
"\u0105\u0106\7*\2\2\u0106\u0107\5&\24\2\u0107\u0108\7+\2\2\u0108\u010c"+
+               
"\3\2\2\2\u0109\u010a\7*\2\2\u010a\u010c\7+\2\2\u010b\u0105\3\2\2\2\u010b"+
+               
"\u0109\3\2\2\2\u010c)\3\2\2\2\u010d\u010e\b\26\1\2\u010e\u010f\5,\27\2"+
+               
"\u010f\u0118\3\2\2\2\u0110\u0111\f\4\2\2\u0111\u0112\7&\2\2\u0112\u0117"+
+               
"\5,\27\2\u0113\u0114\f\3\2\2\u0114\u0115\7$\2\2\u0115\u0117\5,\27\2\u0116"+
+               
"\u0110\3\2\2\2\u0116\u0113\3\2\2\2\u0117\u011a\3\2\2\2\u0118\u0116\3\2"+
+               
"\2\2\u0118\u0119\3\2\2\2\u0119+\3\2\2\2\u011a\u0118\3\2\2\2\u011b\u011c"+
+               
"\b\27\1\2\u011c\u011d\5\60\31\2\u011d\u0126\3\2\2\2\u011e\u011f\f\4\2"+
+               
"\2\u011f\u0120\7)\2\2\u0120\u0125\5,\27\5\u0121\u0122\f\3\2\2\u0122\u0123"+
+               
"\7(\2\2\u0123\u0125\5,\27\4\u0124\u011e\3\2\2\2\u0124\u0121\3\2\2\2\u0125"+
+               
"\u0128\3\2\2\2\u0126\u0124\3\2\2\2\u0126\u0127\3\2\2\2\u0127-\3\2\2\2"+
+               "\u0128\u0126\3\2\2\2\u0129\u012a\7\67\2\2\u012a\u012b\5 
\21\2\u012b/\3"+
+               
"\2\2\2\u012c\u013c\5.\30\2\u012d\u013c\7\64\2\2\u012e\u013c\7\63\2\2\u012f"+
+               
"\u013c\7\66\2\2\u0130\u013c\7\65\2\2\u0131\u013c\7\67\2\2\u0132\u013c"+
+               "\7 
\2\2\u0133\u0134\7.\2\2\u0134\u0135\5*\26\2\u0135\u0136\7/\2\2\u0136"+
+               
"\u013c\3\2\2\2\u0137\u0138\7.\2\2\u0138\u0139\5\22\n\2\u0139\u013a\7/"+
+               
"\2\2\u013a\u013c\3\2\2\2\u013b\u012c\3\2\2\2\u013b\u012d\3\2\2\2\u013b"+
+               
"\u012e\3\2\2\2\u013b\u012f\3\2\2\2\u013b\u0130\3\2\2\2\u013b\u0131\3\2"+
+               
"\2\2\u013b\u0132\3\2\2\2\u013b\u0133\3\2\2\2\u013b\u0137\3\2\2\2\u013c"+
+               
"\61\3\2\2\2\u013d\u014f\t\3\2\2\u013e\u014f\58\35\2\u013f\u014f\5\66\34"+
+               
"\2\u0140\u014f\5*\26\2\u0141\u014f\78\2\2\u0142\u014f\5$\23\2\u0143\u014f"+
+               
"\5(\25\2\u0144\u014f\7\37\2\2\u0145\u0146\7\61\2\2\u0146\u0147\7.\2\2"+
+               
"\u0147\u0148\7\67\2\2\u0148\u014f\7/\2\2\u0149\u014a\7.\2\2\u014a\u014b"+
+               
"\5\22\n\2\u014b\u014c\7/\2\2\u014c\u014f\3\2\2\2\u014d\u014f\5.\30\2\u014e"+
+               
"\u013d\3\2\2\2\u014e\u013e\3\2\2\2\u014e\u013f\3\2\2\2\u014e\u0140\3\2"+
+               
"\2\2\u014e\u0141\3\2\2\2\u014e\u0142\3\2\2\2\u014e\u0143\3\2\2\2\u014e"+
+               
"\u0144\3\2\2\2\u014e\u0145\3\2\2\2\u014e\u0149\3\2\2\2\u014e\u014d\3\2"+
+               
"\2\2\u014f\63\3\2\2\2\u0150\u0151\7\"\2\2\u0151\65\3\2\2\2\u0152\u0153"+
+               
"\7.\2\2\u0153\u0154\7/\2\2\u0154\u0155\7\4\2\2\u0155\u0156\5\4\3\2\u0156"+
+               
"\67\3\2\2\2\u0157\u0158\7.\2\2\u0158\u0159\5:\36\2\u0159\u015a\7/\2\2"+
+               
"\u015a\u015b\7\4\2\2\u015b\u015c\5\4\3\2\u015c\u0162\3\2\2\2\u015d\u015e"+
+               
"\5<\37\2\u015e\u015f\7\4\2\2\u015f\u0160\5\4\3\2\u0160\u0162\3\2\2\2\u0161"+
+               
"\u0157\3\2\2\2\u0161\u015d\3\2\2\2\u01629\3\2\2\2\u0163\u0168\5> \2\u0164"+
+               "\u0165\7\7\2\2\u0165\u0167\5> 
\2\u0166\u0164\3\2\2\2\u0167\u016a\3\2\2"+
+               
"\2\u0168\u0166\3\2\2\2\u0168\u0169\3\2\2\2\u0169;\3\2\2\2\u016a\u0168"+
+               "\3\2\2\2\u016b\u016c\5> 
\2\u016c=\3\2\2\2\u016d\u016e\7\67\2\2\u016e?"+
+               
"\3\2\2\2\u016f\u0170\7!\2\2\u0170\u0171\7*\2\2\u0171\u0172\5B\"\2\u0172"+
+               
"\u0173\7\7\2\2\u0173\u0174\7\"\2\2\u0174\u0175\7#\2\2\u0175\u0176\5F$"+
+               
"\2\u0176\u0177\7+\2\2\u0177A\3\2\2\2\u0178\u017d\5D#\2\u0179\u017a\7\7"+
+               
"\2\2\u017a\u017c\5D#\2\u017b\u0179\3\2\2\2\u017c\u017f\3\2\2\2\u017d\u017b"+
+               
"\3\2\2\2\u017d\u017e\3\2\2\2\u017eC\3\2\2\2\u017f\u017d\3\2\2\2\u0180"+
+               
"\u0181\5H%\2\u0181\u0182\7#\2\2\u0182\u0183\5F$\2\u0183E\3\2\2\2\u0184"+
+               
"\u0185\5\4\3\2\u0185G\3\2\2\2\u0186\u0189\5\24\13\2\u0187\u0189\5\22\n"+
+               
"\2\u0188\u0186\3\2\2\2\u0188\u0187\3\2\2\2\u0189I\3\2\2\2\37[ou{\u0090"+
+               
"\u009b\u009f\u00a9\u00b6\u00be\u00cb\u00d1\u00dc\u00de\u00e7\u00f2\u0100"+
+               
"\u0102\u010b\u0116\u0118\u0124\u0126\u013b\u014e\u0161\u0168\u017d\u0188";
        public static final ATN _ATN =
                new ATNDeserializer().deserialize(_serializedATN.toCharArray());
        static {

http://git-wip-us.apache.org/repos/asf/metron/blob/3df94987/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java
----------------------------------------------------------------------
diff --git 
a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java
 
b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java
index 51e7aaa..7a76071 100644
--- 
a/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java
+++ 
b/metron-stellar/stellar-common/src/main/java/org/apache/metron/stellar/common/utils/StellarProcessorUtils.java
@@ -96,6 +96,7 @@ public class StellarProcessorUtils {
               return variables.get(x);
             }
             ,x-> x.equals(MapVariableResolver.ALL_FIELDS) || 
variables.containsKey(x)
+            ,(x,y) -> variables.put(x,y)
     );
     return run(expression, varResolver, context);
   }

Reply via email to