Jelajahi Sumber

use underscores for var protect.

Nicolas Cannasse 19 tahun lalu
induk
melakukan
b39e501b15
2 mengubah file dengan 3 tambahan dan 11 penghapusan
  1. 1 1
      genswf8.ml
  2. 2 10
      lexer.mll

+ 1 - 1
genswf8.ml

@@ -165,7 +165,7 @@ let always_protected = function
 	(*// haxe.PosInfos *)
 	| "fileName" | "lineNumber" | "className" | "methodName" | "customParams" -> true
 	| s ->
-		if String.length s > 0 && s.[0] = '$' then
+		if String.length s > 0 && s.[0] = '_' then
 			true
 		else
 			false

+ 2 - 10
lexer.mll

@@ -124,8 +124,8 @@ let invalid_char lexbuf =
 
 }
 
-let ident = ['_' 'a'-'z'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']*
-let idtype = ['A' - 'Z'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']*
+let ident = ('_'* ['a'-'z'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']* | '_')
+let idtype = '_'* ['A'-'Z'] ['_' 'a'-'z' 'A'-'Z' '0'-'9']*
 
 rule token = parse
 	| eof { mk lexbuf Eof }
@@ -228,14 +228,6 @@ rule token = parse
 		}	
 	| ident { mk_ident lexbuf }
 	| idtype { mk lexbuf (Const (Type (lexeme lexbuf))) }
-	| '$' ident {
-			if not (Plugin.defined "swf-mark") then invalid_char lexbuf;
-			mk_ident lexbuf
-		}
-	| '$' idtype {
-			if not (Plugin.defined "swf-mark") then invalid_char lexbuf;
-			mk lexbuf (Const (Type (lexeme lexbuf)))
-		}
 	| _ { invalid_char lexbuf }
 
 and comment = parse