Permalink
Browse files

- s/annontation/annotation/g

  • Loading branch information...
1 parent da576ef commit 33cf42cf4dd86c0c9ff0211a97034a57f3c31df6 @felipensp felipensp committed Feb 28, 2012
Showing with 8 additions and 8 deletions.
  1. +7 −7 interpreter/parser.y
  2. +1 −1 interpreter/scanner.re
View
@@ -116,7 +116,7 @@ namespace clever {
%token REGEX "regex-pattern"
%token CONST "const"
%token AUTO "auto"
-%token ANNONTATION "@@"
+%token ANNOTATION "@@"
%left ',';
%left LOGICAL_OR;
@@ -242,7 +242,7 @@ namespace clever {
%type <array_list> array_list
%type <arg_list> map_arg_list
%type <map_list> map_list
-%type <ast_node> annontation
+%type <ast_node> annotation
%%
@@ -303,16 +303,16 @@ args_declaration:
| args_declaration_non_empty
;
-annontation:
- ANNONTATION { $$ = NULL; }
- | annontation ANNONTATION { $$ = NULL; }
+annotation:
+ ANNOTATION { $$ = NULL; }
+ | annotation ANNOTATION { $$ = NULL; }
;
func_declaration:
TYPE IDENT '(' args_declaration ')' block_stmt { $$ = new ast::FuncDeclaration($2, $1, $4, $6); }
- | annontation TYPE IDENT '(' args_declaration ')' block_stmt { $$ = new ast::FuncDeclaration($3, $2, $5, $7); }
+ | annotation TYPE IDENT '(' args_declaration ')' block_stmt { $$ = new ast::FuncDeclaration($3, $2, $5, $7); }
| template IDENT '(' args_declaration ')' block_stmt { $$ = new ast::FuncDeclaration($2, $1, $4, $6); }
- | annontation template IDENT '(' args_declaration ')' block_stmt { $$ = new ast::FuncDeclaration($3, $2, $5, $7); }
+ | annotation template IDENT '(' args_declaration ')' block_stmt { $$ = new ast::FuncDeclaration($3, $2, $5, $7); }
;
ext_func_declaration:
View
@@ -63,7 +63,7 @@ next_token:
<*>SPACE { yylloc->step(); SKIP(); }
<*>[\n]+ { yylloc->lines(yylen); yylloc->step(); SKIP(); }
- <INITIAL>"@@"TYPE { RET(token::ANNONTATION); }
+ <INITIAL>"@@"TYPE { RET(token::ANNOTATION); }
<INITIAL>"or" { RET(token::LOGICAL_OR); }

0 comments on commit 33cf42c

Please sign in to comment.