SMV: rename STRING_Token and QSTRING_Token

This renames the token identifiers used for SMV identifiers to better match
the NuSMV manual.

Author: kroening

src/smvlang/parser.y

@@ -273,8 +273,8 @@ static void new_module(YYSTYPE &module)
 %token ADD_Token
 %token SUB_Token
 
-%token STRING_Token   "string"
-%token QSTRING_Token  "quoted string"
+%token IDENTIFIER_Token   "identifier"
+%token QIDENTIFIER_Token  "quoted identifier"
 %token QUOTE_Token    "'"
 %token NUMBER_Token   "number"
 
@@ -310,7 +310,7 @@ modules    : module
 module     : module_head module_body
            ;
 
-module_name: STRING_Token
+module_name: IDENTIFIER_Token
            | QUOTE_Token
            ;
 
@@ -532,7 +532,7 @@ enum_list  : enum_element
            }
            ;
 
-enum_element: STRING_Token
+enum_element: IDENTIFIER_Token
            {
              $$=$1;
              PARSER.module->enum_set.insert(stack_expr($1).id_string());
@@ -783,7 +783,12 @@ formula_list:
            | formula_list ',' formula { $$=$1; mto($$, $3); }
            ;
 
-identifier : STRING_Token
+identifier : IDENTIFIER_Token
+           | QIDENTIFIER_Token
+           {
+             // not supported by NuSMV
+             init($$, std::string(stack_expr($1).id_string(), 1)); // remove backslash
+           }
            ;
 
 variable_identifier: complex_identifier
@@ -826,19 +831,15 @@ variable_identifier: complex_identifier
            }
            ;
 
-complex_identifier: QSTRING_Token
-           {
-             init($$, std::string(stack_expr($1).id_string(), 1)); // remove backslash
-           }
-           | STRING_Token
-           | complex_identifier DOT_Token QSTRING_Token
+complex_identifier:              identifier
+           | complex_identifier DOT_Token QIDENTIFIER_Token
            {
              std::string id(stack_expr($1).id_string());
              id+=".";
              id+=std::string(stack_expr($3).id_string(), 1); // remove backslash
              init($$, id);
            }
-           | complex_identifier DOT_Token STRING_Token
+           | complex_identifier DOT_Token IDENTIFIER_Token
            {
              std::string id(stack_expr($1).id_string());
              id+=".";

src/smvlang/scanner.l

@@ -176,12 +176,12 @@ void newlocation(YYSTYPE &x)
 [\$A-Za-z_][A-Za-z0-9_\$#-]*	{
                   newstack(yysmvlval);
                   stack_expr(yysmvlval).id(yytext);
-		  return STRING_Token;
+		  return IDENTIFIER_Token;
 		}
 \\[A-Za-z0-9_\$#-]*	{
                   newstack(yysmvlval);
                   stack_expr(yysmvlval).id(yytext);
-		  return QSTRING_Token;
+		  return QIDENTIFIER_Token;
 		}
 [0-9][0-9]*	{
                   newstack(yysmvlval);