瀏覽代碼

@:rttiInfos -> @:rtti

Simon Krajewski 12 年之前
父節點
當前提交
702d0ff23c
共有 5 個文件被更改,包括 6 次插入6 次删除
  1. 2 2
      ast.ml
  2. 1 1
      codegen.ml
  3. 1 1
      main.ml
  4. 1 1
      std/neko/db/Object.hx
  5. 1 1
      tests/unit/unitstd/Type.unit.hx

+ 2 - 2
ast.ml

@@ -110,7 +110,7 @@ module Meta = struct
 		| Remove
 		| Require
 		| ReplaceReflection
-		| RttiInfos
+		| Rtti
 		| Runtime
 		| RuntimeValue
 		| Setter
@@ -218,7 +218,7 @@ module Meta = struct
 		| Remove -> ":remove"
 		| Require -> ":require"
 		| ReplaceReflection -> ":replaceReflection"
-		| RttiInfos -> ":rttiInfos"
+		| Rtti -> ":rtti"
 		| Runtime -> ":runtime"
 		| RuntimeValue -> ":runtimeValue"
 		| Setter -> ":setter"

+ 1 - 1
codegen.ml

@@ -634,7 +634,7 @@ let apply_native_paths ctx t =
 (* Adds the __rtti field if required *)
 let add_rtti ctx t =
 	let rec has_rtti c =
-		Meta.has Meta.RttiInfos c.cl_meta || match c.cl_super with None -> false | Some (csup,_) -> has_rtti csup
+		Meta.has Meta.Rtti c.cl_meta || match c.cl_super with None -> false | Some (csup,_) -> has_rtti csup
 	in
 	match t with
 	| TClassDecl c when has_rtti c && not (PMap.mem "__rtti" c.cl_statics) ->

+ 1 - 1
main.ml

@@ -88,7 +88,7 @@ let deprecated = [
 	"Class not found : Int32","Int32 has been removed, use Int instead";
 	"Identifier 'EType' is not part of enum haxe.macro.ExprDef","EType has been removed, use EField instead";
 	"Identifier 'CType' is not part of enum haxe.macro.Constant","CType has been removed, use CIdent instead";
-	"Class not found : haxe.rtti.Infos","Use @:rttiInfos instead of implementing haxe.rttiInfos";
+	"Class not found : haxe.rtti.Infos","Use @:rtti instead of implementing haxe.rtti.Infos";
 	"Class not found : haxe.rtti.Generic","Use @:generic instead of implementing haxe.Generic";
 ]
 

+ 1 - 1
std/neko/db/Object.hx

@@ -28,7 +28,7 @@ package neko.db;
 #if !spod_macro
 
 #if spod_rtti
-@:rttiInfos
+@:rtti
 #end
 class Object {
 

+ 1 - 1
tests/unit/unitstd/Type.unit.hx

@@ -6,7 +6,7 @@ Type.getClass(Float) == null;
 Type.getClass(null) == null;
 Type.getClass(Int) == null;
 Type.getClass(Bool) == null;
-Type.getClass(haxe.macro.Expr.ExprDef.EBreak) == null;
+//Type.getClass(haxe.macro.Expr.ExprDef.EBreak) == null;
 Type.getClass( { } ) == null;
 
 // getEnum