Browse Source

[cpp] Remove old hxast code. Cppast all the way!

hughsando 9 years ago
parent
commit
52fa932ada
3 changed files with 31 additions and 1373 deletions
  1. 30 1366
      src/generators/gencpp.ml
  2. 1 3
      src/main.ml
  3. 0 4
      src/typing/common.ml

File diff suppressed because it is too large
+ 30 - 1366
src/generators/gencpp.ml


+ 1 - 3
src/main.ml

@@ -1480,9 +1480,7 @@ try
 			add_std "php";
 			add_std "php";
 			"php"
 			"php"
 		| Cpp ->
 		| Cpp ->
-			if Common.defined_value_safe com Define.NoCppAst="" then
-			   Common.define_value com Define.CppAst "1";
-			Common.define_value com Define.HxcppApiLevel (if Common.defined_value_safe com Define.CppAst <>"" then "330" else "321");
+			Common.define_value com Define.HxcppApiLevel "330";
 			add_std "cpp";
 			add_std "cpp";
 			if Common.defined com Define.Cppia then
 			if Common.defined com Define.Cppia then
 				classes := (make_path "cpp.cppia.HostClasses" ) :: !classes;
 				classes := (make_path "cpp.cppia.HostClasses" ) :: !classes;

+ 0 - 4
src/typing/common.ml

@@ -166,7 +166,6 @@ module Define = struct
 		| CheckXmlProxy
 		| CheckXmlProxy
 		| CoreApi
 		| CoreApi
 		| CoreApiSerialize
 		| CoreApiSerialize
-		| CppAst
 		| Cppia
 		| Cppia
 		| Dce
 		| Dce
 		| DceDebug
 		| DceDebug
@@ -210,7 +209,6 @@ module Define = struct
 		| NoAnalyzer
 		| NoAnalyzer
 		| NoCompilation
 		| NoCompilation
 		| NoCOpt
 		| NoCOpt
-		| NoCppAst
 		| NoDeprecationWarnings
 		| NoDeprecationWarnings
 		| NoFlashOverride
 		| NoFlashOverride
 		| NoDebug
 		| NoDebug
@@ -255,7 +253,6 @@ module Define = struct
 		| CheckXmlProxy -> ("check_xml_proxy","Check the used fields of the xml proxy")
 		| CheckXmlProxy -> ("check_xml_proxy","Check the used fields of the xml proxy")
 		| CoreApi -> ("core_api","Defined in the core api context")
 		| CoreApi -> ("core_api","Defined in the core api context")
 		| CoreApiSerialize -> ("core_api_serialize","Mark some generated core api classes with the Serializable attribute on C#")
 		| CoreApiSerialize -> ("core_api_serialize","Mark some generated core api classes with the Serializable attribute on C#")
-		| CppAst -> ("cppast", "Generate experimental cpp code")
 		| Cppia -> ("cppia", "Generate cpp instruction assembly")
 		| Cppia -> ("cppia", "Generate cpp instruction assembly")
 		| Dce -> ("dce","<mode:std|full||no> Set the dead code elimination mode (default std)")
 		| Dce -> ("dce","<mode:std|full||no> Set the dead code elimination mode (default std)")
 		| DceDebug -> ("dce_debug","Show DCE log")
 		| DceDebug -> ("dce_debug","Show DCE log")
@@ -300,7 +297,6 @@ module Define = struct
 		| NoAnalyzer -> ("no-analyzer","Disable the static analyzer")
 		| NoAnalyzer -> ("no-analyzer","Disable the static analyzer")
 		| NoCompilation -> ("no-compilation","Disable final compilation for Cs, Cpp and Java")
 		| NoCompilation -> ("no-compilation","Disable final compilation for Cs, Cpp and Java")
 		| NoCOpt -> ("no_copt","Disable completion optimization (for debug purposes)")
 		| NoCOpt -> ("no_copt","Disable completion optimization (for debug purposes)")
-		| NoCppAst -> ("no_cppast", "Do not generate experimental cpp code")
 		| NoDebug -> ("no_debug","Remove all debug macros from cpp output")
 		| NoDebug -> ("no_debug","Remove all debug macros from cpp output")
 		| NoDeprecationWarnings -> ("no-deprecation-warnings","Do not warn if fields annotated with @:deprecated are used")
 		| NoDeprecationWarnings -> ("no-deprecation-warnings","Do not warn if fields annotated with @:deprecated are used")
 		| NoFlashOverride -> ("no-flash-override", "Change overrides on some basic classes into HX suffixed methods, flash only")
 		| NoFlashOverride -> ("no-flash-override", "Change overrides on some basic classes into HX suffixed methods, flash only")

Some files were not shown because too many files changed in this diff