Added __ctfeWrite; Test cases: Combine all compilable/*-postscript.sh…

… files.
dlang · Mar 10, 2012 · 67d4435 · 67d4435
1 parent 6d2dcfe
commit 67d4435
Show file tree

Hide file tree

Showing 41 changed files with 75 additions and 211 deletions.
diff --git a/src/expression.c b/src/expression.c
@@ -1148,7 +1148,7 @@ void argExpTypesToCBuffer(OutBuffer *buf, Expressions *arguments, HdrGenState *h
  * Print expressions to stdmsg, used by pragma(msg).
  */
 
-void printExpressionsToStdmsg(Loc loc, Expressions *args, Scope *sc)
+void printExpressionsToStdmsg(Loc loc, Expressions *args, Scope *sc, bool printNewLine)
 {
     for (size_t i = 0; i < args->dim; i++)
     {
@@ -1169,7 +1169,8 @@ void printExpressionsToStdmsg(Loc loc, Expressions *args, Scope *sc)
         else
             fprintf(stdmsg, "%s", e->toChars());
     }
-    fprintf(stdmsg, "\n");
+    if (printNewLine)
+        fprintf(stdmsg, "\n");
 }
 
 /******************************** Expression **************************/

diff --git a/src/expression.h b/src/expression.h
@@ -83,7 +83,7 @@ void modifyFieldVar(Loc loc, Scope *sc, VarDeclaration *var, Expression *e1);
 Expression *resolveAliasThis(Scope *sc, Expression *e);
 #endif
 
-void printExpressionsToStdmsg(Loc loc, Expressions *args, Scope *sc);
+void printExpressionsToStdmsg(Loc loc, Expressions *args, Scope *sc, bool printNewLine=true);
 
 /* Interpreter: what form of return value expression is required?
  */

diff --git a/src/idgen.c b/src/idgen.c
@@ -57,7 +57,7 @@ Msgtable msgtable[] =
     { "funcptr" },
     { "dollar", "__dollar" },
     { "ctfe", "__ctfe" },
-    { "ctfeWriteln", "__ctfeWriteln" },
+    { "ctfeWrite", "__ctfeWrite" },
     { "offset" },
     { "offsetof" },
     { "ModuleInfo" },

diff --git a/src/interpret.c b/src/interpret.c
@@ -6247,6 +6247,8 @@ Expression *foreachApplyUtf(InterState *istate, Expression *str, Expression *del
     return eresult;
 }
 
+
+
 /* If this is a built-in function, return the interpreted result,
  * Otherwise, return NULL.
  */
@@ -6270,8 +6272,8 @@ Expression *evaluateIfBuiltin(InterState *istate, Loc loc,
     if (!pthis)
     {
         enum BUILTIN b = fd->isBuiltin();
-        bool isCTFEWriteln = fd->ident == Id::ctfeWriteln;
-        if (b || isCTFEWriteln)
+        bool isCTFEWrite = fd->ident == Id::ctfeWrite;
+        if (b || isCTFEWrite)
         {   Expressions args;
             args.setDim(nargs);
             for (size_t i = 0; i < args.dim; i++)
@@ -6282,9 +6284,9 @@ Expression *evaluateIfBuiltin(InterState *istate, Loc loc,
                     return earg;
                 args.tdata()[i] = earg;
             }
-            if (isCTFEWriteln)
+            if (isCTFEWrite)
             {
-                printExpressionsToStdmsg(loc, &args, NULL);
+                printExpressionsToStdmsg(loc, &args, NULL, /*printNewLine*/false);
                 e = EXP_VOID_INTERPRET;
             }
             else

diff --git a/test/compilable/ddoc1.d b/test/compilable/ddoc1.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc1-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc1.html
 // REQUIRED_ARGS: -d
 
 /** This module is for ABC

diff --git a/test/compilable/ddoc10.d b/test/compilable/ddoc10.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc10-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc10.html
 
 // 294
 

diff --git a/test/compilable/ddoc11.d b/test/compilable/ddoc11.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc11-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc11.html
 
 /// The various floating point exceptions
 enum
@@ -49,7 +49,7 @@ struct lldiv_t { long quot,rem; }
 
 
 
-    void *calloc(size_t, size_t);	/// 
+    void *calloc(size_t, size_t);	///
     void *malloc(size_t);	/// dittx
 
 /**

diff --git a/test/compilable/ddoc12.d b/test/compilable/ddoc12.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc12-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc12.html
 
 int ruhred; /// This documents correctly.
 int rühred; /// This should too

diff --git a/test/compilable/ddoc13.d b/test/compilable/ddoc13.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc13-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc13.html
 
 /// struct doc
 struct Bug4107(T)

diff --git a/test/compilable/ddoc14.d b/test/compilable/ddoc14.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc14-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc14.html
 
 
 alias void V;
@@ -77,7 +77,7 @@ interface Interface {
     V mColon(lazy P p) ; /// 10
 }
 +/
-    
+
 public P variable;  /// 0
 V mNone(lazy P p) {}  /// 1
 pure nothrow V mPrefix(lazy P p) {}   /// 2

diff --git a/test/compilable/ddoc2.d b/test/compilable/ddoc2.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc2-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc2.html
 
 /**
  * Summary

diff --git a/test/compilable/ddoc3.d b/test/compilable/ddoc3.d
@@ -1,7 +1,7 @@
 // EXTRA_SOURCES: extra-files/ddoc3.ddoc
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc3-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc3.html
 
 /**
  * Summary
@@ -42,7 +42,7 @@
  *	$(TROW 4, 5, 6)
  *	)
  *
- * $(D_CODE 
+ * $(D_CODE
       $(B pragma)( $(I name) );
       $(B pragma)( $(I name) , $(I option) [ $(I option) ] );
       $(U $(LPAREN))

diff --git a/test/compilable/ddoc4.d b/test/compilable/ddoc4.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc4-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc4.html
 
 /**
     a

diff --git a/test/compilable/ddoc5.d b/test/compilable/ddoc5.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc5-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc5.html
 
 /**
 
@@ -15,10 +15,10 @@ class TestMembers(TemplateArg)
   public:
     /**
 
-       a static method 
+       a static method
 
        Params: idx = index
-   
+
     */
     static void PublicStaticMethod(int  idx)
     {

diff --git a/test/compilable/ddoc6.d b/test/compilable/ddoc6.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc6-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc6.html
 
 /**
  *

diff --git a/test/compilable/ddoc6491.d b/test/compilable/ddoc6491.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddocAny-postscript.sh 6491
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc6491.html
 
 module ddoc6491;
 

diff --git a/test/compilable/ddoc7.d b/test/compilable/ddoc7.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc7-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc7.html
 
 //-----------------------------------------------
 /// my enum

diff --git a/test/compilable/ddoc8.d b/test/compilable/ddoc8.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc8-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc8.html
 
 /** foo */
 

diff --git a/test/compilable/ddoc9.d b/test/compilable/ddoc9.d
@@ -1,6 +1,6 @@
 // PERMUTE_ARGS:
 // REQUIRED_ARGS: -D -Ddtest_results/compilable -o-
-// POST_SCRIPT: compilable/extra-files/ddoc9-postscript.sh
+// POST_SCRIPT: compilable/extra-files/diff-postscript.sh ddoc9.html
 
 // 273
 

diff --git a/test/compilable/extra-files/ddoc1-postscript.sh b/test/compilable/extra-files/ddoc1-postscript.sh
diff --git a/test/compilable/extra-files/ddoc10-postscript.sh b/test/compilable/extra-files/ddoc10-postscript.sh
diff --git a/test/compilable/extra-files/ddoc11-postscript.sh b/test/compilable/extra-files/ddoc11-postscript.sh
diff --git a/test/compilable/extra-files/ddoc12-postscript.sh b/test/compilable/extra-files/ddoc12-postscript.sh
diff --git a/test/compilable/extra-files/ddoc13-postscript.sh b/test/compilable/extra-files/ddoc13-postscript.sh
diff --git a/test/compilable/extra-files/ddoc14-postscript.sh b/test/compilable/extra-files/ddoc14-postscript.sh
diff --git a/test/compilable/extra-files/ddoc2-postscript.sh b/test/compilable/extra-files/ddoc2-postscript.sh
diff --git a/test/compilable/extra-files/ddoc3-postscript.sh b/test/compilable/extra-files/ddoc3-postscript.sh
diff --git a/test/compilable/extra-files/ddoc4-postscript.sh b/test/compilable/extra-files/ddoc4-postscript.sh
diff --git a/test/compilable/extra-files/ddoc5-postscript.sh b/test/compilable/extra-files/ddoc5-postscript.sh
diff --git a/test/compilable/extra-files/ddoc6-postscript.sh b/test/compilable/extra-files/ddoc6-postscript.sh
diff --git a/test/compilable/extra-files/ddoc7-postscript.sh b/test/compilable/extra-files/ddoc7-postscript.sh
diff --git a/test/compilable/extra-files/ddoc8-postscript.sh b/test/compilable/extra-files/ddoc8-postscript.sh
diff --git a/test/compilable/extra-files/ddoc9-postscript.sh b/test/compilable/extra-files/ddoc9-postscript.sh
diff --git a/test/compilable/extra-files/ddocAny-postscript.sh b/test/compilable/extra-files/ddocAny-postscript.sh