Changeset 57

Timestamp:

06/01/06 22:33:31 (2 years ago)

Author:

Gregor

Message:

bcd.gen/bcd/gen/bcdgen.d: Many, many fixes.

Files:

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

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

@@ -318 +318 @@
-char[] getNName(xmlNode *node)
-{
-
-
-
+
+
+
+
+
+
+
-    return name;
-}
@@ -364 +368 @@
-    char* demangled = getDemangled(node);
-    char* incomplete = xmlGetProp(node, "incomplete");
+    if (incomplete) free(incomplete);
-    
-    if (file && (demangled || allowNameless) && !incomplete) {
@@ -407 +412 @@
-        if (file) free(file);
-        if (demangled) free(demangled);
-        if (incomplete) free(incomplete);
-        return false;
-    }
@@ -616 +620 @@
-    if (find(base, '<') != -1) base = "bcd.bind.BoundClass";
-    
-name
+safeName(name)
-    
-    dtail ~= "this(ifloat ignore) {\n";
@@ -656 +660 @@
-        dtail ~= "struct ";
-    }
-name
+safeName(name)
-    
-    curClass = demangled;
@@ -685 +689 @@
-                dhead ~= "extern (C) void _BCD_set_" ~ mangled ~ "(void *, " ~ type.DType ~ ");\n";
-            
-name
+safeName(name)
-                dtail ~= "_BCD_set_" ~ mangled ~ "(__C_data, x);\n";
-                dtail ~= "}\n";
@@ -700 +704 @@
-            dhead ~= "extern (C) " ~ type.DType ~ " _BCD_get_" ~ mangled ~ "(void *);\n";
-        
-name
+safeName(name)
-            dtail ~= "return _BCD_get_" ~ mangled ~ "(__C_data);\n";
-            dtail ~= "}\n";
@@ -716 +720 @@
-                dhead ~= "extern (C) void _BCD_set_" ~ mangled ~ "(" ~ type.DType ~ ");\n";
-            
-name
+safeName(name)
-                dtail ~= "_BCD_set_" ~ mangled ~ "(x);\n";
-                dtail ~= "}\n";
@@ -731 +735 @@
-            dhead ~= "extern (C) " ~ type.DType ~ " _BCD_get_" ~ mangled ~ "();\n";
-        
-name
+safeName(name)
-            dtail ~= "return _BCD_get_" ~ mangled ~ "();\n";
-            dtail ~= "}\n";
@@ -1141 +1145 @@
-    static bool[char[]] handledTypedefs;
-    
-    if (!parseThis(node)) return;
-    
-    char[] type = toStringFree(xmlGetProp(node, "id"));
-    char[] deftype = toStringFree(xmlGetProp(node, "type"));
@@ -1154 +1156 @@
-        cout ~= "typedef " ~ pt.CType ~ " _BCD_" ~ aname ~ ";\n";
-        
-dhead ~= "alias " ~ pt.DType ~ " " ~ aname
+if (parseThis(node, true)) dhead ~= "alias " ~ pt.DType ~ " " ~ safeName(aname)
-    }
-}
@@ -1186 +1188 @@
-        if (aname[0] == '.') return;
-        
-aname
+safeName(aname)
-        
-        xmlNode *curNode = null;
@@ -1242 +1244 @@
-    {
-        ParsedType pt = new ParsedType(this);
+        pt.className ~= className;
-        pt.isClass = isClass;
-        pt.isClassPtr = isClassPtr;
@@ -1256 +1259 @@
-}
-
+extern (C) int getpid();
+extern (C) int kill(int, int);
-/**
- * Get the type of a node in C[++] and D
@@ -1264 +1269 @@
-    
-    int xmlrret;
+    
+    if (type == "") kill(getpid(), 11);
-    
-    // first find the element matching the type
@@ -1413 +1420 @@
-                        // 1) cut off the *
-                        baseType.CType = baseType.CType[0 .. baseType.CType.length - 2];
-
+    
-                        // 2) add the &
-                        if (outputC) {
@@ -1420 +1427 @@
-                            baseType.CType ~= " &";
-                        }
-
+    
-                        ParsedType pt = new ParsedType(baseType);
-                        pt.isClassPtr = true;
@@ -1496 +1503 @@
-                    ParsedType pt = parseType(toStringFree(xmlGetProp(curNode, "type")));
-                    char[] aname = getNName(curNode);
-
-if (parseThis(curNode)) 
-
+    
+
+    
-                    ParsedType rpt = new ParsedType("_BCD_" ~ aname, pt.DType);
-                    rpt.isClass = pt.isClass;
@@ -1510 +1517 @@
-                    if (!(type in handledFunctions)) {
-                        handledFunctions[type] = true;
-
+    
-                        ParsedType pt = parseType(toStringFree(xmlGetProp(curNode, "returns")));
-                        char[] couta, dheada;
-
+    
-                        bool first = true;
-                        couta = "typedef " ~ pt.CType ~
@@ -1524 +1531 @@
-                            if (curArg.type == xmlElementType.XML_ELEMENT_NODE) {
-                                char[] aname = toString(curArg.name);
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                                }
-                            
-                                couta ~= argType.CType;
-                                dheada ~= argType.DType;
-                            }
-                        }
@@ -1566 +1585 @@
-                        if (context != "") {
-                            ParsedType pt = parseType(context);
+                            
+                            pt.CType = replace(pt.CType, " *", "");
+                            
-                            if (pt.CType == "") {
-                                pt.CType = "enum " ~ aname;