little renaming

ast.ml

@@ -124,7 +124,7 @@ type token =
 	| DblDot
 	| Arrow
 	| IntInterval of string
-	| Macro of string
+	| Sharp of string
 	| Question
 	| At
 	| Dollar of string
@@ -449,7 +449,7 @@ let s_token = function
 	| DblDot -> ":"
 	| Arrow -> "->"
 	| IntInterval s -> s ^ "..."
-	| Macro s -> "#" ^ s
+	| Sharp s -> "#" ^ s
 	| Question -> "?"
 	| At -> "@"
 	| Dollar v -> "$" ^ v

lexer.mll

@@ -292,7 +292,7 @@ and token = parse
 	| '#' ident {
 			let v = lexeme lexbuf in
 			let v = String.sub v 1 (String.length v - 1) in
-			mk lexbuf (Macro v)
+			mk lexbuf (Sharp v)
 		}
 	| '$' ['_' 'a'-'z' 'A'-'Z' '0'-'9']* {
 			let v = lexeme lexbuf in

parser.ml

@@ -1002,25 +1002,25 @@ let parse ctx code =
 			next_token()
 		| CommentLine s ->
 			next_token()
-		| Macro "end" ->
+		| Sharp "end" ->
 			(match !mstack with
 			| [] -> tk
 			| _ :: l ->
 				mstack := l;
 				next_token())
-		| Macro "else" | Macro "elseif" ->
+		| Sharp "else" | Sharp "elseif" ->
 			(match !mstack with
 			| [] -> tk
 			| _ :: l ->
 				mstack := l;
 				process_token (skip_tokens (snd tk) false))
-		| Macro "if" ->
+		| Sharp "if" ->
 			process_token (enter_macro (snd tk))
-		| Macro "error" ->
+		| Sharp "error" ->
 			(match Lexer.token code with
 			| (Const (String s),p) -> error (Custom s) p
 			| _ -> error Unimplemented (snd tk))
-		| Macro "line" ->
+		| Sharp "line" ->
 			let line = (match next_token() with
 				| (Const (Int s),_) -> int_of_string s
 				| (t,p) -> error (Unexpected t) p
@@ -1083,16 +1083,16 @@ let parse ctx code =
 
 	and skip_tokens_loop p test tk =
 		match fst tk with
-		| Macro "end" ->
+		| Sharp "end" ->
 			Lexer.token code
-		| Macro "elseif" | Macro "else" when not test ->
+		| Sharp "elseif" | Sharp "else" when not test ->
 			skip_tokens p test
-		| Macro "else" ->
+		| Sharp "else" ->
 			mstack := snd tk :: !mstack;
 			Lexer.token code
-		| Macro "elseif" ->
+		| Sharp "elseif" ->
 			enter_macro (snd tk)
-		| Macro "if" ->
+		| Sharp "if" ->
 			skip_tokens_loop p test (skip_tokens p false)
 		| Eof ->
 			if do_resume() then tk else error Unclosed_macro p