• R/O
  • SSH
  • HTTPS

jpl: Commit


Commit MetaInfo

Revision331 (tree)
Time2018-11-15 06:25:55
Authorjakobthomsen

Log Message

cleanup

Change Summary

Incremental Difference

--- trunk/advanced/compiler.compiled.c (revision 330)
+++ trunk/advanced/compiler.compiled.c (revision 331)
@@ -15702,7 +15702,6 @@
1570215702 case 18446744073709550569LLU: /* skip to here */
1570315703
1570415704 case 18446744073709550575LLU: /* skip to here */
15705-/* predicate */
1570615705 /* parse data */
1570715706
1570815707 {/* PUSH */stack[stackbase + 41LLU] = stack[stackbase + 33LLU]; }/* SP + 1LLU = 42LLU */
@@ -15709,35 +15708,27 @@
1570915708 {/* PUSH */stack[stackbase + 42LLU] = stack[stackbase + 34LLU]; }/* SP + 1LLU = 43LLU *//* match-predicate */
1571015709
1571115710 if(/*none_u64__*/0xA6AA60030F3A0000LLU != stack[stackbase + 41LLU])
15712-{ /* JUMP */ fnaddr = 18446744073709550559LLU; break; } /* skip match */
15713-/* match */
15714-{/* PUSH */stack[stackbase + 43LLU] = 1LLU; }/* SP + 1LLU = 44LLU *//* SP - 1LLU = 43LLU */ /* MATCH-RESULT */
15715-{ /* RESULT */stack[stackbase + 41LLU] = stack[stackbase + 43LLU]; }/* SP = 42LLU */
15716-{ /* JUMP */ fnaddr = 18446744073709550558LLU; break; } /* skip other */
15717-case 18446744073709550559LLU: /* other *//* SP = 41LLU */
15718-{/* PUSH */stack[stackbase + 41LLU] = 0LLU; }/* SP + 1LLU = 42LLU */
15719-case 18446744073709550558LLU: /* skip to here */
15711+{ /* JUMP */ fnaddr = 18446744073709550560LLU; break; } /* skip match */
15712+/* match *//* predicate */
1572015713
15721-{/* PUSH */stack[stackbase + 42LLU] = stack[stackbase + 20LLU]; }/* SP + 1LLU = 43LLU */
15722-{/* PUSH */stack[stackbase + 43LLU] = stack[stackbase + 3LLU]; }/* SP + 1LLU = 44LLU *//* SP = 42LLU */
15714+{/* PUSH */stack[stackbase + 43LLU] = stack[stackbase + 20LLU]; }/* SP + 1LLU = 44LLU */
15715+{/* PUSH */stack[stackbase + 44LLU] = stack[stackbase + 3LLU]; }/* SP + 1LLU = 45LLU *//* SP = 43LLU */
1572315716 {
15724-{/* PUSH */stack[stackbase + 42LLU] = stack[stackbase + 42LLU] == stack[stackbase + 43LLU]; }/* SP + 1LLU = 43LLU */ }/* SP = 41LLU */
15725-{
15726-{/* PUSH */stack[stackbase + 41LLU] = stack[stackbase + 41LLU] && stack[stackbase + 42LLU]; }/* SP + 1LLU = 42LLU */ }
15727-if(!/* SP - 1LLU = 41LLU *//* POP */stack[stackbase + 41LLU])
15728-{ /* JUMP */ fnaddr = 18446744073709550560LLU; break; } /* skip consequent */
15717+{/* PUSH */stack[stackbase + 43LLU] = stack[stackbase + 43LLU] == stack[stackbase + 44LLU]; }/* SP + 1LLU = 44LLU */ }
15718+if(!/* SP - 1LLU = 43LLU *//* POP */stack[stackbase + 43LLU])
15719+{ /* JUMP */ fnaddr = 18446744073709550558LLU; break; } /* skip consequent */
1572915720 /* consequent */
1573015721 fprintf(stderr, "[line %llu]", (long long unsigned int)stack[4]);fputs("recursive function ", stderr);
1573115722 {
1573215723 /* CALLBEGIN */
15733- /* reserve space for 0LLU returned values *//* SP + 0LLU = 41LLU */
15734-{/* PUSH */stack[stackbase + 41LLU] = stackbase; }/* SP + 1LLU = 42LLU */
15735- /* leave place for return addr *//* SP + 1LLU = 43LLU */
15724+ /* reserve space for 0LLU returned values *//* SP + 0LLU = 43LLU */
15725+{/* PUSH */stack[stackbase + 43LLU] = stackbase; }/* SP + 1LLU = 44LLU */
15726+ /* leave place for return addr *//* SP + 1LLU = 45LLU */
1573615727 }
15737-{/* PUSH */stack[stackbase + 43LLU] = stack[stackbase + 20LLU]; }/* SP + 1LLU = 44LLU */
15728+{/* PUSH */stack[stackbase + 45LLU] = stack[stackbase + 20LLU]; }/* SP + 1LLU = 46LLU */
1573815729 {
1573915730 /*CALLEND*/
15740- stackbase += 43LLU;
15731+ stackbase += 45LLU;
1574115732 stack[stackbase - 1] = 0xFFFFFFFFFFFFFBDDLLU;
1574215733 fnaddr = /*reportid__*/0xB60AEAB6F91F0000LLU;/* SP = 0LLU */
1574315734 { if(stackbase + 7LLU >= 0x0000000000100000LLU) { fprintf(stderr, "STACKOVERFLOW calling /*reportid__*/\n"); exit(-1); } }
@@ -15744,10 +15735,14 @@
1574415735 break;
1574515736 }
1574615737 case 0xFFFFFFFFFFFFFBDDLLU:
15747-/* SP = 41LLU */fputs("\n", stderr); fputs("requires size-specification\n", stderr);
15738+/* SP = 43LLU */fputs("\n", stderr); fputs("requires size-specification\n", stderr);
1574815739 {/* set exit-value */stack[16LLU] = 255LLU; }
15749-{ /* JUMP */ fnaddr = 0LLU; break; }/* SP = 41LLU */
15750-case 18446744073709550560LLU: /* alternative *//* predicate */
15740+{ /* JUMP */ fnaddr = 0LLU; break; }/* SP = 43LLU */
15741+case 18446744073709550558LLU: /* alternative *//* SP = 43LLU *//* SP - 0LLU = 43LLU */ /* MATCH-RESULT *//* SP = 41LLU */
15742+{ /* JUMP */ fnaddr = 18446744073709550559LLU; break; } /* skip other */
15743+case 18446744073709550560LLU: /* other *//* SP = 41LLU *//* SP = 41LLU */
15744+case 18446744073709550559LLU: /* skip to here */
15745+/* predicate */
1575115746
1575215747 {/* PUSH */stack[stackbase + 41LLU] = 13784076749618806784LLU; }/* SP + 1LLU = 42LLU */
1575315748 {/* PUSH */stack[stackbase + 42LLU] = stack[stackbase + 35LLU]; }/* SP + 1LLU = 43LLU */
--- trunk/advanced/compiler.source.c (revision 330)
+++ trunk/advanced/compiler.source.c (revision 331)
@@ -2307,15 +2307,21 @@
23072307 }
23082308
23092309 // NOTE: to keep things simple there are no function-declarations and mutual recursion is not supported
2310- when and(match none_u64 def.essential.storedsize: 1 other 0, equ(tok.id, self.id))
2310+ match none_u64 def.essential.storedsize:
23112311 {
2312- DEBUGLINE()
2313- report "recursive function "
2314- reportid(tok.id)
2315- report "\n"
2316- report "requires size-specification\n"
2317- exit(255)
2312+ when equ(tok.id, self.id)
2313+ {
2314+ DEBUGLINE()
2315+ report "recursive function "
2316+ reportid(tok.id)
2317+ report "\n"
2318+ report "requires size-specification\n"
2319+ exit(255)
2320+ }
23182321 }
2322+ other
2323+ {
2324+ }
23192325
23202326 when not(equ<type>(typeval(def.essential.resub), retype))
23212327 {
Show on old repository browser