vala r1911 - in trunk: . compiler vala

[juergbi svn gnome org]

Author: juergbi
Date: Sat Oct 25 07:04:11 2008
New Revision: 1911
URL: http://svn.gnome.org/viewvc/vala?rev=1911&view=rev

Log:
2008-10-25  JÃrg Billeter  <j bitron ch>

	* vala/valacodecontext.vala:
	* compiler/valacompiler.vala:

	Remove non-working support for conditional compilation


Modified:
   trunk/ChangeLog
   trunk/compiler/valacompiler.vala
   trunk/vala/valacodecontext.vala

Modified: trunk/compiler/valacompiler.vala
==============================================================================
--- trunk/compiler/valacompiler.vala	(original)
+++ trunk/compiler/valacompiler.vala	Sat Oct 25 07:04:11 2008
@@ -49,8 +49,6 @@
 	[NoArrayLength]
 	static string[] cc_options;
 	static bool save_temps;
-	[NoArrayLength]
-	static string[] defines;
 	static bool quiet_mode;
 
 	private CodeContext context;
@@ -67,7 +65,6 @@
 		{ "output", 'o', 0, OptionArg.FILENAME, ref output, "Place output in file FILE", "FILE" },
 		{ "debug", 'g', 0, OptionArg.NONE, ref debug, "Produce debug information", null },
 		{ "thread", 0, 0, OptionArg.NONE, ref thread, "Enable multithreading support", null },
-		{ "define", 'D', 0, OptionArg.STRING_ARRAY, ref defines, "Define SYMBOL", "SYMBOL..." },
 		{ "disable-assert", 0, 0, OptionArg.NONE, ref disable_assert, "Disable assertions", null },
 		{ "disable-checking", 0, 0, OptionArg.NONE, ref disable_checking, "Disable run-time checks", null },
 		{ "disable-non-null", 0, 0, OptionArg.NONE, ref disable_non_null, "Disable non-null types", null },
@@ -182,12 +179,6 @@
 			Report.error (null, "This version of valac only supports GLib 2");
 		}
 
-		if (defines != null) {
-			foreach (string define in defines) {
-				context.add_define (define);
-			}
-		}
-
 		context.codegen = new CCodeGenerator ();
 
 		/* default packages */

Modified: trunk/vala/valacodecontext.vala
==============================================================================
--- trunk/vala/valacodecontext.vala	(original)
+++ trunk/vala/valacodecontext.vala	Sat Oct 25 07:04:11 2008
@@ -144,8 +144,6 @@
 
 	private Gee.List<string> packages = new ArrayList<string> (str_equal);
 
-	private Gee.List<string> defines = new ArrayList<string> (str_equal);
-
 	/**
 	 * The root namespace of the symbol tree.
 	 *
@@ -377,24 +375,6 @@
 		file.mark = 2;
 	}
 
-	public void add_define (string define) {
-		defines.add (define);
-	}
-
-	public bool ignore_node (CodeNode node) {
-		var attr = node.get_attribute ("Conditional");
-		if (attr == null) {
-			return false;
-		} else {
-			var condition = attr.get_string ("condition");
-			if (condition == null) {
-				return false;
-			} else {
-				return !defines.contains (condition);
-			}
-		}
-	}
-
 	public string? get_package_path (string pkg, [CCode (array_length_pos = 1.9)] string[] vapi_directories) {
 		string basename = "%s.vapi".printf (pkg);
 		string filename = null;