Changeset 1523:833337c65fd3

Timestamp:

07/06/09 18:54:02 (7 months ago)

Author:

Robert Clipsham <robert@octarineparrot.com>

branch:

default

Message:

Fixed some unmerged parts of the D2 frontend.
Removed the automatic linker flags for D2 (temp).
Renamed a runtime function for D2.

Files:

• dmd2/expression.c (modified) (4 diffs)
• gen/main.cpp (modified) (2 diffs)
• gen/runtime.cpp (modified) (1 diff)

dmd2/expression.c

@@ -8747 +8747 @@
-    e1->checkIntegral();
-    e2 = e2->checkIntegral();
-
-
+
+
+
+
+
-    return this;
-}
@@ -8776 +8779 @@
-    e1->checkIntegral();
-    e2 = e2->checkIntegral();
-
-
+
+
+
+
+
-    return this;
-}
@@ -9344 +9350 @@
-    e2 = e2->checkIntegral();
-    e1 = e1->integralPromotions(sc);
-
+
+
-    type = e1->type;
-    }
@@ -9368 +9375 @@
-    e2 = e2->checkIntegral();
-    e1 = e1->integralPromotions(sc);
-
+
+
-    type = e1->type;
-    }

gen/main.cpp

@@ -312 +312 @@
-    else if (!noDefaultLib)
-    {
+#if !DMDV2
-        global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
-        global.params.linkswitches->push(mem.strdup("-ltango-cc-tango"));
@@ -318 +319 @@
-        // with linking order
-        global.params.linkswitches->push(mem.strdup("-lldc-runtime"));
+#endif
-    }
-

gen/runtime.cpp

@@ -329 +329 @@
-    // Object _d_allocclass(ClassInfo ci)
-    {
+#if DMDV2
+        std::string fname("_d_newclass");
+#else
-        std::string fname("_d_allocclass");
+#endif
-        std::vector<const LLType*> types;
-        types.push_back(classInfoTy);