Skip to content

Commit

Permalink
renaming token types to be consistent
Browse files Browse the repository at this point in the history
  • Loading branch information
thejoshwolfe committed Sep 18, 2010
1 parent cdafb37 commit 5aa83c2
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions pascal.l
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ Z [zZ]

[0-9]+ {
yylval.literal_integer = new LiteralInteger(Utils::string_to<int>(yytext), line_number);
return TOKEN_DIGIT_SEQUENCE;
return TOKEN_LITERAL_INTEGER;
}
[0-9]+\.[0-9]+ {
yylval.literal_real = new LiteralReal(Utils::string_to<float>(yytext), line_number);
return TOKEN_REAL;
return TOKEN_LITERAL_REAL;
}

"'" {
Expand All @@ -111,7 +111,7 @@ Z [zZ]
}
}
yylval.literal_string = new LiteralString(yytext, line_number);
return TOKEN_STRING;
return TOKEN_LITERAL_STRING;
}

{T}{R}{U}{E} {
Expand Down
14 changes: 7 additions & 7 deletions pascal.y
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,9 @@ Program * main_program;
%token KEYWORD_VAR
%token KEYWORD_WHILE

%token <literal_integer> TOKEN_DIGIT_SEQUENCE
%token <literal_real> TOKEN_REAL
%token <literal_string> TOKEN_STRING
%token <literal_integer> TOKEN_LITERAL_INTEGER
%token <literal_real> TOKEN_LITERAL_REAL
%token <literal_string> TOKEN_LITERAL_STRING
%token <literal_boolean> TOKEN_LITERAL_BOOLEAN
%token <identifier> TOKEN_IDENTIFIER

Expand Down Expand Up @@ -204,7 +204,7 @@ type_denoter : array_type {
$$ = new TypeDenoter(TypeDenoter::BOOLEAN);
};

array_type : KEYWORD_ARRAY KEYWORD_LEFT_BRACKET TOKEN_DIGIT_SEQUENCE KEYWORD_DOT_DOT TOKEN_DIGIT_SEQUENCE KEYWORD_RIGHT_BRACKET KEYWORD_OF type_denoter {
array_type : KEYWORD_ARRAY KEYWORD_LEFT_BRACKET TOKEN_LITERAL_INTEGER KEYWORD_DOT_DOT TOKEN_LITERAL_INTEGER KEYWORD_RIGHT_BRACKET KEYWORD_OF type_denoter {
$$ = new ArrayType($3, $5, $8);
};

Expand Down Expand Up @@ -370,11 +370,11 @@ sign : KEYWORD_PLUS {
$$ = -1;
};

primary_expression : TOKEN_DIGIT_SEQUENCE {
primary_expression : TOKEN_LITERAL_INTEGER {
$$ = new PrimaryExpression($1);
} | TOKEN_REAL {
} | TOKEN_LITERAL_REAL {
$$ = new PrimaryExpression($1);
} | TOKEN_STRING {
} | TOKEN_LITERAL_STRING {
$$ = new PrimaryExpression($1);
} | TOKEN_LITERAL_BOOLEAN {
$$ = new PrimaryExpression($1);
Expand Down

0 comments on commit 5aa83c2

Please sign in to comment.