[Gd-chatter] r11230 - branches/GD_2_4/src/tools/melange

[prom at gwydiondylan.org]

Author: prom
Date: Sat Mar 10 19:15:49 2007
New Revision: 11230

Modified:
   branches/GD_2_4/src/tools/melange/c-lexer-cpp.dylan
Log:
Job: minor
Removed some of the new debugging stuff from melange because it broke bootstrap.
The specific part removed didnt seem too useful anyway.
Also, 2.4 doesnt really need new feats. Hack 2.5 instead. ;)


Modified: branches/GD_2_4/src/tools/melange/c-lexer-cpp.dylan
==============================================================================
--- branches/GD_2_4/src/tools/melange/c-lexer-cpp.dylan	(original)
+++ branches/GD_2_4/src/tools/melange/c-lexer-cpp.dylan	Sat Mar 10 19:15:49 2007
@@ -786,12 +786,6 @@
 // continue as normal.
 //
 
-// for debugging
-define function map-string-value(foo)
-  foo & map(string-value, foo)
-end;
-
-
 define method try-cpp
     (state :: <tokenizer>, start-pos :: <integer>) => (result :: <boolean>);
   let contents = state.contents;
@@ -854,10 +848,9 @@
             if (~name)
               parse-error(state, "Ill formed #ifdef directive.");
             end if;
-            parse-progress-report(name, "ifdef %=, element = %=", name.string-value,
-                                  element(state.cpp-table, name.string-value,
-                                          default: #f).map-string-value);
-            if (element(state.cpp-table, name.string-value, default: #f))
+            let elt = element(state.cpp-table, name.string-value, default: #f);
+            parse-progress-report(name, "ifdef %=", name.string-value);
+            if (elt)
               parse-progress-report(name, "ifdef %= -- taking true branch",
                                     name.string-value);
               state.cpp-stack := pair(#"accept", state.cpp-stack);
@@ -876,10 +869,9 @@
             if (~name)
               parse-error(state, "Ill formed #ifndef directive.");
             end if;
-            parse-progress-report(name, "ifndef %=, element = %=", name.string-value,
-                                  element(state.cpp-table, name.string-value,
-                                          default: #f).map-string-value);
-            if (~element(state.cpp-table, name.string-value, default: #f))
+            let elt = element(state.cpp-table, name.string-value, default: #f);
+            parse-progress-report(name, "ifndef %=", name.string-value);
+            if (~elt)
               parse-progress-report(name, "ifndef %= -- taking true branch",
                                     name.string-value);
               state.cpp-stack := pair(#"accept", state.cpp-stack);