Changeset 121

Timestamp:

12/27/06 17:32:16 (2 years ago)

Author:

Gregor

Message:

bcd.gen/bcd/gen/bcdgen.d: Support for #define aliases (eg #define foo 0\n#define bar foo)

Files:

• trunk/bcd.gen/bcd/gen/bcdgen.d (modified) (4 diffs)

trunk/bcd.gen/bcd/gen/bcdgen.d

@@ -325 +325 @@
-        std.file.remove("bcd/" ~ dNamespace ~ "/template_D.h");
-    }
-
+//
-    //std.file.remove("out.xml");
-    
@@ -2105 +2105 @@
-    bool inOurFile = false;
-    
+    bool[char[]] curDefines;
+    
-    while (!f.eof()) {
-        char[] ln = f.readLine();
@@ -2132 +2134 @@
-                if (lns.length >= 3) {
-                    if (isNumeric(lns[2])) {
+                        curDefines[lns[1]] = true;
+                        
-                        /* isNumeric can accept ending with 'L', but long is
-                         * (usually) int, so strip it */
@@ -2146 +2150 @@
-                                " = " ~ lns[2] ~ ";\n";
-                        }
+                        
-                    } else if (lns[2].length >= 2 &&
-                               lns[2][0] == '"' && lns[2][$-1] == '"') {
+                        curDefines[lns[1]] = true;
+                        
-                        // a constant string
-                        dhead ~= "const char[] " ~ safeName(lns[1]) ~
-                            " = " ~ lns[2] ~ ";\n";
+                        
+                    } else if (lns[2] in curDefines) {
+                        curDefines[lns[1]] = true;
+                        
+                        // could be #define'ing to something already #defined
+                        dhead ~= "alias " ~ safeName(lns[2]) ~ " " ~ safeName(lns[1]) ~ ";\n";
-                    }
-                }