- s/annontation/annotation/g

clever-lang · Feb 28, 2012 · 33cf42c · 33cf42c
1 parent da576ef
commit 33cf42c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/interpreter/parser.y b/interpreter/parser.y
@@ -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:

diff --git a/interpreter/scanner.re b/interpreter/scanner.re
@@ -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); }