Merge remote-tracking branch 'origin/master'

Author: laurayuwen

src/common/exp-syntax.k

@@ -13,8 +13,9 @@ syntax PrefixPostfixExp ::= "++" Exp [klabel('PreIncr)]
 		| Exp "--" [klabel('PostDecr)]
 
  //use sort K instead of Exp for the sake of Lookup, others might be changed when needed
-syntax Exp ::= K "*" K [seqstrict, klabel('Mul)]
-		| K "/" K [seqstrict, klabel('Div)]
+syntax Exp ::=
+      K "*" K     [seqstrict, klabel('Mul)]
+		| Exp "/" Exp [seqstrict, klabel('Div)]
 		| K "%" K [seqstrict, klabel('Remain)]
 		| "+" Exp [strict, klabel('Plus)]
 		| "-" Exp [strict, klabel('Minus)]

src/exec/var-lookup.k

@@ -174,7 +174,7 @@ rule [lvalue-typedLoc]:
   May be wrapped inside lvalue. If lookup is unwrapped, it evaluates to TypedVal - the store value,
   of the type T - the second lookup argument. If lookup is wrapped into lvalue, it evaluates to loc(OL)::T.
 */
-syntax Lookup ::= lookup (
+syntax Exp ::= lookup (
                     Int,  //OL - the store location to lookup
                     Type  // T - the compile-time type of the resulting value
                   )