This PR will fix issue #141 and #142 (#143)

* added index for viewdoc

* pushing first viewdoc

* Added more formating for viewdoc

* Added goornogo coverage test pipeline

* Lowering minimum coverage by 0.1 % to pass on travis

* change circle-ci to use goornogo

* Merge from upstream

* Fixed bug as reported on issu #141 and #142

antlr/grulev3.g4

@@ -30,13 +30,12 @@ thenScope
     ;
 
 thenExpressionList
-    : thenExpression+
+    : (thenExpression SEMICOLON)+
     ;
 
 thenExpression
-    : assignment SEMICOLON
-    | functionCall SEMICOLON
-    | variable methodCall SEMICOLON
+    : assignment
+    | expressionAtom
     ;
 
 assignment
@@ -75,10 +74,11 @@ orLogicOperator
 
 expressionAtom
     : constant
-    | functionCall
     | variable
+    | functionCall
     | expressionAtom methodCall
     | expressionAtom memberVariable
+    | expressionAtom arrayMapSelector
     | NEGATION expressionAtom
     ;
 
@@ -91,9 +91,9 @@ constant
     ;
 
 variable
-    : SIMPLENAME
-    | variable memberVariable
+    : variable memberVariable
     | variable arrayMapSelector
+    | SIMPLENAME
     ;
 
 arrayMapSelector

antlr/parser/grulev3/grulev3.tokens

@@ -1,80 +1,80 @@
-T__0=1
-PLUS=2
-MINUS=3
-DIV=4
-MUL=5
-MOD=6
-DOT=7
-SEMICOLON=8
-LR_BRACE=9
-RR_BRACE=10
-LR_BRACKET=11
-RR_BRACKET=12
-LS_BRACKET=13
-RS_BRACKET=14
-RULE=15
-WHEN=16
-THEN=17
-AND=18
-OR=19
-TRUE=20
-FALSE=21
-NIL_LITERAL=22
-NEGATION=23
-SALIENCE=24
-EQUALS=25
-ASSIGN=26
-PLUS_ASIGN=27
-MINUS_ASIGN=28
-DIV_ASIGN=29
-MUL_ASIGN=30
-GT=31
-LT=32
-GTE=33
-LTE=34
-NOTEQUALS=35
-BITAND=36
-BITOR=37
-SIMPLENAME=38
-DQUOTA_STRING=39
-SQUOTA_STRING=40
-DECIMAL_FLOAT_LIT=41
-DECIMAL_EXPONENT=42
-HEX_FLOAT_LIT=43
-HEX_EXPONENT=44
-DEC_LIT=45
-HEX_LIT=46
-OCT_LIT=47
-SPACE=48
-COMMENT=49
-LINE_COMMENT=50
-','=1
-'+'=2
-'-'=3
-'/'=4
-'*'=5
-'%'=6
-'.'=7
-';'=8
-'{'=9
-'}'=10
-'('=11
-')'=12
-'['=13
-']'=14
-'&&'=18
-'||'=19
-'!'=23
-'=='=25
-'='=26
-'+='=27
-'-='=28
-'/='=29
-'*='=30
-'>'=31
-'<'=32
-'>='=33
-'<='=34
-'!='=35
-'&'=36
-'|'=37
+T__0=1
+PLUS=2
+MINUS=3
+DIV=4
+MUL=5
+MOD=6
+DOT=7
+SEMICOLON=8
+LR_BRACE=9
+RR_BRACE=10
+LR_BRACKET=11
+RR_BRACKET=12
+LS_BRACKET=13
+RS_BRACKET=14
+RULE=15
+WHEN=16
+THEN=17
+AND=18
+OR=19
+TRUE=20
+FALSE=21
+NIL_LITERAL=22
+NEGATION=23
+SALIENCE=24
+EQUALS=25
+ASSIGN=26
+PLUS_ASIGN=27
+MINUS_ASIGN=28
+DIV_ASIGN=29
+MUL_ASIGN=30
+GT=31
+LT=32
+GTE=33
+LTE=34
+NOTEQUALS=35
+BITAND=36
+BITOR=37
+SIMPLENAME=38
+DQUOTA_STRING=39
+SQUOTA_STRING=40
+DECIMAL_FLOAT_LIT=41
+DECIMAL_EXPONENT=42
+HEX_FLOAT_LIT=43
+HEX_EXPONENT=44
+DEC_LIT=45
+HEX_LIT=46
+OCT_LIT=47
+SPACE=48
+COMMENT=49
+LINE_COMMENT=50
+','=1
+'+'=2
+'-'=3
+'/'=4
+'*'=5
+'%'=6
+'.'=7
+';'=8
+'{'=9
+'}'=10
+'('=11
+')'=12
+'['=13
+']'=14
+'&&'=18
+'||'=19
+'!'=23
+'=='=25
+'='=26
+'+='=27
+'-='=28
+'/='=29
+'*='=30
+'>'=31
+'<'=32
+'>='=33
+'<='=34
+'!='=35
+'&'=36
+'|'=37

antlr/parser/grulev3/grulev3Lexer.tokens

@@ -1,80 +1,80 @@
-T__0=1
-PLUS=2
-MINUS=3
-DIV=4
-MUL=5
-MOD=6
-DOT=7
-SEMICOLON=8
-LR_BRACE=9
-RR_BRACE=10
-LR_BRACKET=11
-RR_BRACKET=12
-LS_BRACKET=13
-RS_BRACKET=14
-RULE=15
-WHEN=16
-THEN=17
-AND=18
-OR=19
-TRUE=20
-FALSE=21
-NIL_LITERAL=22
-NEGATION=23
-SALIENCE=24
-EQUALS=25
-ASSIGN=26
-PLUS_ASIGN=27
-MINUS_ASIGN=28
-DIV_ASIGN=29
-MUL_ASIGN=30
-GT=31
-LT=32
-GTE=33
-LTE=34
-NOTEQUALS=35
-BITAND=36
-BITOR=37
-SIMPLENAME=38
-DQUOTA_STRING=39
-SQUOTA_STRING=40
-DECIMAL_FLOAT_LIT=41
-DECIMAL_EXPONENT=42
-HEX_FLOAT_LIT=43
-HEX_EXPONENT=44
-DEC_LIT=45
-HEX_LIT=46
-OCT_LIT=47
-SPACE=48
-COMMENT=49
-LINE_COMMENT=50
-','=1
-'+'=2
-'-'=3
-'/'=4
-'*'=5
-'%'=6
-'.'=7
-';'=8
-'{'=9
-'}'=10
-'('=11
-')'=12
-'['=13
-']'=14
-'&&'=18
-'||'=19
-'!'=23
-'=='=25
-'='=26
-'+='=27
-'-='=28
-'/='=29
-'*='=30
-'>'=31
-'<'=32
-'>='=33
-'<='=34
-'!='=35
-'&'=36
-'|'=37
+T__0=1
+PLUS=2
+MINUS=3
+DIV=4
+MUL=5
+MOD=6
+DOT=7
+SEMICOLON=8
+LR_BRACE=9
+RR_BRACE=10
+LR_BRACKET=11
+RR_BRACKET=12
+LS_BRACKET=13
+RS_BRACKET=14
+RULE=15
+WHEN=16
+THEN=17
+AND=18
+OR=19
+TRUE=20
+FALSE=21
+NIL_LITERAL=22
+NEGATION=23
+SALIENCE=24
+EQUALS=25
+ASSIGN=26
+PLUS_ASIGN=27
+MINUS_ASIGN=28
+DIV_ASIGN=29
+MUL_ASIGN=30
+GT=31
+LT=32
+GTE=33
+LTE=34
+NOTEQUALS=35
+BITAND=36
+BITOR=37
+SIMPLENAME=38
+DQUOTA_STRING=39
+SQUOTA_STRING=40
+DECIMAL_FLOAT_LIT=41
+DECIMAL_EXPONENT=42
+HEX_FLOAT_LIT=43
+HEX_EXPONENT=44
+DEC_LIT=45
+HEX_LIT=46
+OCT_LIT=47
+SPACE=48
+COMMENT=49
+LINE_COMMENT=50
+','=1
+'+'=2
+'-'=3
+'/'=4
+'*'=5
+'%'=6
+'.'=7
+';'=8
+'{'=9
+'}'=10
+'('=11
+')'=12
+'['=13
+']'=14
+'&&'=18
+'||'=19
+'!'=23
+'=='=25
+'='=26
+'+='=27
+'-='=28
+'/='=29
+'*='=30
+'>'=31
+'<'=32
+'>='=33
+'<='=34
+'!='=35
+'&'=36
+'|'=37