Convert idgen to D

dlang · Feb 22, 2015 · aa8a7b3 · aa8a7b3
1 parent d30acc5
commit aa8a7b3
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 35 deletions.
diff --git a/src/idgen.c → src/idgen.d b/src/idgen.c → src/idgen.d
@@ -15,19 +15,18 @@
 //      id.h
 //      id.c
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <assert.h>
+import core.stdc.stdio;
+import core.stdc.stdlib;
+import core.stdc.string;
 
 struct Msgtable
 {
-        const char *ident;      // name to use in DMD source
-        const char *name;       // name in D executable
+    const(char)* ident;      // name to use in DMD source
+    const(char)* name;       // name in D executable
 };
 
-Msgtable msgtable[] =
-{
+Msgtable[] msgtable =
+[
     { "IUnknown" },
     { "Object" },
     { "object" },
@@ -354,31 +353,34 @@ Msgtable msgtable[] =
     { "basic_ostream" },
     { "basic_iostream" },
     { "char_traits" },
-};
+];
 
 
 int main()
 {
-    FILE *fp;
-    unsigned i;
+    {
+        import std.stdio : writeln;
+        writeln("Generating id.c and id.h");
+    }
 
     {
-        fp = fopen("id.h","w");
+        auto fp = fopen("id.h","w");
         if (!fp)
-        {   printf("can't open id.h\n");
+        {
+            printf("can't open id.h\n");
             exit(EXIT_FAILURE);
         }
 
-        fprintf(fp, "// File generated by idgen.c\n");
+        fprintf(fp, "// File generated by idgen.d\n");
         fprintf(fp, "#ifndef DMD_ID_H\n");
         fprintf(fp, "#define DMD_ID_H 1\n");
         fprintf(fp, "class Identifier;\n");
         fprintf(fp, "struct Id\n");
         fprintf(fp, "{\n");
 
-        for (i = 0; i < sizeof(msgtable) / sizeof(msgtable[0]); i++)
-        {   const char *id = msgtable[i].ident;
-
+        foreach(e; msgtable)
+        {
+            auto id = e.ident;
             fprintf(fp,"    static Identifier *%s;\n", id);
         }
 
@@ -390,19 +392,21 @@ int main()
     }
 
     {
-        fp = fopen("id.c","w");
+        auto fp = fopen("id.c","w");
         if (!fp)
-        {   printf("can't open id.c\n");
+        {
+            printf("can't open id.c\n");
             exit(EXIT_FAILURE);
         }
 
-        fprintf(fp, "// File generated by idgen.c\n");
+        fprintf(fp, "// File generated by idgen.d\n");
         fprintf(fp, "#include \"identifier.h\"\n");
         fprintf(fp, "#include \"id.h\"\n");
 
-        for (i = 0; i < sizeof(msgtable) / sizeof(msgtable[0]); i++)
-        {   const char *id = msgtable[i].ident;
-            const char *p = msgtable[i].name;
+        foreach(e; msgtable)
+        {
+            auto id = e.ident;
+            auto p = e.name;
 
             if (!p)
                 p = id;
@@ -412,9 +416,10 @@ int main()
         fprintf(fp, "void Id::initialize()\n");
         fprintf(fp, "{\n");
 
-        for (i = 0; i < sizeof(msgtable) / sizeof(msgtable[0]); i++)
-        {   const char *id = msgtable[i].ident;
-            const char *p = msgtable[i].name;
+        foreach(e; msgtable)
+        {
+            auto id = e.ident;
+            auto p = e.name;
 
             if (!p)
                 p = id;

diff --git a/src/posix.mak b/src/posix.mak
@@ -38,6 +38,7 @@ LDFLAGS=-lm -lstdc++ -lpthread
 #endif
 CC=$(HOST_CC) $(MODEL_FLAG)
 GIT=git
+HOST_DC?=dmd
 
 # Compiler Warnings
 ifdef ENABLE_WARNINGS
@@ -182,7 +183,7 @@ else
 endif
 
 SRC = win32.mak posix.mak osmodel.mak \
-	mars.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c \
+	mars.c enum.c struct.c dsymbol.c import.c idgen.d impcnvgen.c \
 	identifier.c mtype.c expression.c optimize.c template.h \
 	template.c lexer.c declaration.c cast.c cond.h cond.c link.c \
 	aggregate.h parse.c statement.c constfold.c version.h version.c \
@@ -306,9 +307,8 @@ $(optabgen_output) : optabgen
 idgen_output = id.h id.c
 $(idgen_output) : idgen
 
-idgen : idgen.c
-	$(CC) idgen.c -o idgen
-	./idgen
+idgen : idgen.d
+	$(HOST_DC) -run idgen
 
 ######### impcnvgen generates some source
 

diff --git a/src/win32.mak b/src/win32.mak
@@ -123,7 +123,7 @@ CFLAGS=-I$(INCLUDE) $(OPT) $(CFLAGS) $(DEBUG) -cpp -DTARGET_WINDOS=1 -DDM_TARGET
 # Compile flags for modules with backend/toolkit dependencies
 MFLAGS=-I$C;$(TK) $(OPT) -DMARS -cpp $(DEBUG) -e -wx -DTARGET_WINDOS=1 -DDM_TARGET_CPU_X86=1 -DDMDV2=1
 # Recursive make
-DMDMAKE=$(MAKE) -fwin32.mak C=$C TK=$(TK) ROOT=$(ROOT)
+DMDMAKE=$(MAKE) -fwin32.mak C=$C TK=$(TK) ROOT=$(ROOT) HOST_DC=$(HOST_DC)
 
 ############################### Rule Variables ###############################
 
@@ -174,7 +174,7 @@ ROOTOBJS= man.obj port.obj checkedint.obj \
 	$(GCOBJS)
 
 # D front end
-SRCS= mars.c enum.c struct.c dsymbol.c import.c idgen.c impcnvgen.c utf.h \
+SRCS= mars.c enum.c struct.c dsymbol.c import.c idgen.d impcnvgen.c utf.h \
 	utf.c entity.c identifier.c mtype.c expression.c optimize.c \
 	template.h template.c lexer.c declaration.c cast.c \
 	cond.h cond.c link.c aggregate.h staticassert.h parse.c statement.c \
@@ -376,9 +376,8 @@ impcnvtab.c : impcnvgen.c
 	$(CC) -I$(ROOT) -cpp -DDM_TARGET_CPU_X86=1 impcnvgen
 	.\impcnvgen.exe
 
-id.h id.c : idgen.c
-	$(CC) -cpp -DDM_TARGET_CPU_X86=1 idgen
-	.\idgen.exe
+id.h id.c : idgen.d
+	$(HOST_DC) -run idgen
 
 verstr.h : ..\VERSION
 	echo "$(..\VERSION)" >verstr.h