Adding handling for primitives, non-primitives, and user-defined types; doesn't handl...

[iot2.git] / others / jflex / iotparser.jflex

diff --git a/others/jflex/iotparser.jflex b/others/jflex/iotparser.jflex
index bad298efff7e36044e4b2b72f929fe7a38778e74..239c81dcbba6859e129d59078309a523f0b0d883 100644 (file)
--- a/others/jflex/iotparser.jflex
+++ b/others/jflex/iotparser.jflex
@@ -64,16 +64,17 @@ white_space = {new_line} | [ \t\f]
 
 <YYINITIAL>{
 /* keywords */
-"int"             { return symbol("int",TYPE, "INT" ); }
-"short"           { return symbol("short",TYPE, "SHORT" ); }
-"byte"            { return symbol("byte",TYPE, "BYTE" ); }
-"long"            { return symbol("long",TYPE, "LONG" ); }
-"float"           { return symbol("float",TYPE, "FLOAT" ); }
-"double"          { return symbol("double",TYPE, "DOUBLE" ); }
-"char"            { return symbol("char",TYPE, "CHAR" ); }
-"string"          { return symbol("string",TYPE, "STRING" ); }
-"boolean"         { return symbol("boolean",TYPE, "BOOL" ); }
-"void"            { return symbol("void",TYPE, "VOID" ); }
+"int"             { return symbol("int",TYPE, "int" ); }
+"short"           { return symbol("short",TYPE, "short" ); }
+"byte"            { return symbol("byte",TYPE, "byte" ); }
+"long"            { return symbol("long",TYPE, "long" ); }
+"float"           { return symbol("float",TYPE, "float" ); }
+"double"          { return symbol("double",TYPE, "double" ); }
+"char"            { return symbol("char",TYPE, "char" ); }
+"string"          { return symbol("string",TYPE, "String" ); }
+"String"          { return symbol("String",TYPE, "String" ); }
+"boolean"         { return symbol("boolean",TYPE, "boolean" ); }
+"void"            { return symbol("void",TYPE, "void" ); }
 "public"          { return symbol("public",PUBLIC); }
 "interface"       { return symbol("interface",INTERFACE); }
 "capability"      { return symbol("capability",CAPABILITY); }
@@ -101,9 +102,10 @@ white_space = {new_line} | [ \t\f]
   \"              { string.setLength(0); yybegin(STRING); }
 ";"               { return symbol("semicolon",SEMICOLON); }
 ","               { return symbol("comma",COMMA); }
-"."               { return symbol("dot",DOT); }
 "("               { return symbol("(",LPAR); }
 ")"               { return symbol(")",RPAR); }
+"<"               { return symbol("<",LANG); }
+">"               { return symbol(">",RANG); }
 "{"               { return symbol("{",BEGIN); }
 "}"               { return symbol("}",END); }
 "="               { return symbol("=",ASSIGN); }