Browse Source

activate neko v2 by default (use -D neko_v1 to get neko 1.x compat)

Nicolas Cannasse 12 years ago
parent
commit
3ef388d385
2 changed files with 3 additions and 3 deletions
  1. 2 2
      common.ml
  2. 1 1
      genneko.ml

+ 2 - 2
common.ml

@@ -163,7 +163,7 @@ module Define = struct
 		| Macro
 		| Macro
 		| MacroTimes
 		| MacroTimes
 		| NekoSource
 		| NekoSource
-		| NekoV2
+		| NekoV1
 		| NetworkSandbox
 		| NetworkSandbox
 		| NoCompilation
 		| NoCompilation
 		| NoCOpt
 		| NoCOpt
@@ -224,7 +224,7 @@ module Define = struct
 		| Macro -> ("macro","Defined when we compile code in the macro context")
 		| Macro -> ("macro","Defined when we compile code in the macro context")
 		| MacroTimes -> ("macro_times","Display per-macro timing when used with --times")
 		| MacroTimes -> ("macro_times","Display per-macro timing when used with --times")
 		| NekoSource -> ("neko_source","Output neko source instead of bytecode")
 		| NekoSource -> ("neko_source","Output neko source instead of bytecode")
-		| NekoV2 -> ("neko_v2","Activate Neko 2.0 compatibility")
+		| NekoV1 -> ("neko_v1","Keep Neko 1.x compatibility")
 		| NetworkSandbox -> ("network-sandbox","Use local network sandbox instead of local file access one")
 		| NetworkSandbox -> ("network-sandbox","Use local network sandbox instead of local file access one")
 		| NoCompilation -> ("no-compilation","Disable CPP final compilation")
 		| NoCompilation -> ("no-compilation","Disable CPP final compilation")
 		| NoCOpt -> ("no_copt","Disable completion optimization (for debug purposes)")
 		| NoCOpt -> ("no_copt","Disable completion optimization (for debug purposes)")

+ 1 - 1
genneko.ml

@@ -817,7 +817,7 @@ let build ctx types =
 	packs @ methods @ boot :: names @ inits @ vars
 	packs @ methods @ boot :: names @ inits @ vars
 
 
 let generate com =
 let generate com =
-	let ctx = new_context com (if Common.defined com Define.NekoV2 then 2 else 1) false in
+	let ctx = new_context com (if Common.defined com Define.NekoV1 then 1 else 2) false in
 	let t = Common.timer "neko generation" in
 	let t = Common.timer "neko generation" in
 	let libs = (EBlock (generate_libs_init com.neko_libs) , { psource = "<header>"; pline = 1; }) in
 	let libs = (EBlock (generate_libs_init com.neko_libs) , { psource = "<header>"; pline = 1; }) in
 	let el = build ctx com.types in
 	let el = build ctx com.types in