Merge tag 'binaries-20140810' into lse

.travis.yml

@@ -0,0 +1,10 @@
+language: c
+compiler:
+  - gcc
+install:
+  - sudo apt-get update -qq
+  - sudo apt-get install -y gcc-multilib g++-multilib cmake
+before_script:
+  - cmake source/compiler -DCMAKE_C_FLAGS=-m32
+script:
+  - make

source/compiler/sc1.c

@@ -493,9 +493,9 @@ int pc_compile(int argc, char *argv[])
         strcpy(inpfname,sname); /* avoid invalid filename */
         error(100,sname);
       } /* if */
-      pc_writesrc(ftmp,(unsigned char*)"#file ");
+      pc_writesrc(ftmp,(unsigned char*)"#file \"");
       pc_writesrc(ftmp,(unsigned char*)sname);
-      pc_writesrc(ftmp,(unsigned char*)"\n");
+      pc_writesrc(ftmp,(unsigned char*)"\"\n");
       while (!pc_eofsrc(fsrc)) {
         pc_readsrc(fsrc,tstring,sizeof tstring);
         pc_writesrc(ftmp,tstring);
@@ -2310,7 +2310,6 @@ static int base;
   if (cur==numdim-1)
     return 0;
   /* 2 or more dimensions left, fill in an indirection vector */
-  assert(dim[cur]>0);
   if (dim[cur+1]>0) {
     for (d=0; d<dim[cur]; d++)
       litq[base++]=(dim[cur]+d*(dim[cur+1]-1)+increment) * sizeof(cell);

source/compiler/sc2.c

@@ -1015,6 +1015,7 @@ static int command(void)
         inpfname=duplicatestring(pathname);
         if (inpfname==NULL)
           error(103);           /* insufficient memory */
+        insert_dbgfile(inpfname);
       } /* if */
     } /* if */
     check_empty(lptr);
@@ -1828,7 +1829,7 @@ static const unsigned char *unpackedstring(const unsigned char *lptr,int *flags)
         *flags &= ~STRINGIZE;
         continue;
       } else if (*stringize==',' || *stringize==')' || *stringize=='}' ||
-                 *stringize==';' || *stringize==':') { /* end */
+                 *stringize==';') { /* end */
         lptr=stringize;
         break;
       } else if (*stringize=='\0') {
@@ -1902,7 +1903,7 @@ static const unsigned char *packedstring(const unsigned char *lptr,int *flags)
         *flags &= ~STRINGIZE;
         continue;
       } else if (*stringize==',' || *stringize==')' || *stringize=='}' ||
-                 *stringize==';' || *stringize==':') { /* end */
+                 *stringize==';') { /* end */
         lptr=stringize;
         break;
       } else if (*stringize=='\0') {

source/compiler/sc4.c

@@ -264,9 +264,9 @@ SC_FUNC void setfiledirect(char *name)
 {
   if (sc_status==statFIRST && sc_listing) {
     assert(name!=NULL);
-    pc_writeasm(outf,"#file ");
+    pc_writeasm(outf,"#file \"");
     pc_writeasm(outf,name);
-    pc_writeasm(outf,"\n");
+    pc_writeasm(outf,"\"\n");
   } /* if */
 }