Fixed bug in parsing of variables.

infer/src/llvm/lLexer.mll

@@ -150,9 +150,9 @@ rule token = parse
   (*| "va_arg" { VA_ARG }*)
   (*| "landingpad" { LANDINGPAD }*)
 
-  (* identifiers - make this complete *)
-  | '@'  { AT }
-  | '%'  { PERCENT }
+  (* identifiers *)
+  | '@' (id as str) { GLOBAL str }
+  | '%' (id as str) { LOCAL str }
   | id as str { IDENT str }
 
   | eof { EOF }

infer/src/llvm/lParser.mly

@@ -27,8 +27,6 @@
 %token EQUALS
 %token STAR
 %token X
-%token AT
-%token PERCENT
 
 (* TYPES *)
 %token VOID
@@ -127,6 +125,8 @@
 (*%token VA_ARG*)
 (*%token LANDINGPAD*)
 
+%token <string> GLOBAL
+%token <string> LOCAL
 %token <string> IDENT
 
 %token EOF
@@ -238,8 +238,8 @@ operand:
   | const=constant { Const const }
 
 variable:
-  | AT id=IDENT { Global id }
-  | PERCENT id=IDENT { Local id }
+  | id=GLOBAL { Global id }
+  | id=LOCAL { Local id }
 
 constant:
   | i=CONSTINT { Cint i }