Merge pull request #133 from Joe7M/master

Fix bug #132 Function Exprseq doesn't work

Author: chrisws

samples/distro-examples/tests/all.bas

@@ -12,6 +12,8 @@ n=1234
 a=[1,1;2,-1,-2;1,-2,2,1;1,-3,1,3;3,-1,-2]
 b=[44,3,4,5,6]
 inva=[1,-1,1;2,-1,2;3,2,-1]
+def expression(x) = x * 0.1
+DATA 1,"a"
 
 print "ACCESS:" +IFF(ACCESS ("/etc/hostname") != 0, "<> 0", "0")
 print "APPEND:"; : APPEND c, "1", "2", "3", "4": PRINT c
@@ -21,7 +23,7 @@ print "BEEP:" ':BEEP
 print "BLOAD:" ':BLOAD "/etc/hostname"
 print "BPUTC#:" ':BPUTC# fileN; byte
 print "BSAVE:" ':BSAVE filename, address, length
-print "CALL:" ':CALL (fp)
+print "CALL:" :aa=@expression: aa=CALL(aa,5):if(aa != 0.5) then throw "CALL failed"
 print "CHART:" ':CHART LINECHART|BARCHART, array() [, style [, x1, y1, x2, y2]]
 print "CHDIR:" ':CHDIR dir
 print "CHMOD:" ':CHMOD file, mode
@@ -30,7 +32,7 @@ print "CLOSE:" ':CLOSE #fileN
 print "CLS:" :CLS
 print "COLOR:" :COLOR 1,2
 print "COPY:" ':COPY "file", "newfile"
-print "DATEDMY:"': DATEDMY(100000,d,m,y); PRINT d,m,u
+print "DATEDMY:";: DATEDMY(2459590,jd,jm,jy): print jd;jm;jy
 print "DELAY:" ':DELAY ms
 print "DELETE:" :DELETE a, 1
 print "DERIV:" ':DERIV x, maxtries, maxerr, BYREF result, BYREF errcode USE expr
@@ -40,22 +42,22 @@ print "DRAW:" :DRAW ""
 print "DRAWPOLY:" ':DRAWPOLY array [,x-origin,y-origin [, scalef [, color]]] [COLOR color] [FILLED]
 print "EMPTY:" ':EMPTY (x)
 print "ENV:" :ENV("foo=bar"): if (env("foo") != "bar") then throw "env failed"
-print "EXPRSEQ:" ':EXPRSEQ BYREF array, xmin, xmax, count USE expression
+print "EXPRSEQ:" : EXPRSEQ aa, -30, 70, 5 USE expression(x): if aa != [-3,-0.5,2,4.5,7] then throw "EXPRSEQ failed"
 print "FORM(map):" ':FORM(map)
 print "IMAGE:" ':IMAGE [#handle | fileName | http://path-to-file.png | image-var | array of pixmap data]
 print "INPUT:" ':INPUT #fileN; var1 [,delim] [, var2 [,delim]] ...
 print "INPUT:" ':INPUT [prompt,|;] var[, var [, ...]]
-print "INSERT:" :INSERT a, 2, "this", "that", "the", "other"
+print "INSERT:" :InsIn=[1,2,3]:INSERT InsIn,2,"this","that","the","other":if(InsIn != [1,2,"other","the","that","this",3]) then throw "INSERT failed"
 print "INTERSECT:" ':INTERSECT Ax, Ay, Bx, By, Cx, Cy, Dx, Dy, BYREF type, BYREF Rx, BYREF Ry
-print "JOIN:" ':JOIN a, ",.", "ss": PRINT words
+print "JOIN:" :JoinIn=["a","b","c"]:JOIN JoinIn(),"-",JoinOut:if(JoinOut != "a-b-c") then throw("JOIN failed")
 print "KILL:" ':KILL "file"
 print "LINE:" ':LINE [STEP] x,y [,|STEP x2,y2] [, color| COLOR color]
 print "LINEINPUT:" ':LINEINPUT [#fileN] var
 print "LINPUT:" ':LINPUT [#fileN] var
 print "LOCATE:" ':LOCATE y, x
 print "LOCK:" ':LOCK
 print "LOGPRINT:" ':LOGPRINT ...
-print "M3APPLY:" ': M3APPLY m3x3, poly
+print "M3APPLY:" ': M3APPLY m3x3, polyko
 print "M3IDENT:" ':M3IDENT m3x3
 print "M3ROTATE:" ':M3ROTATE m3x3, angle
 print "M3SCALE:" ':M3SCALE m3x3, x, y, Sx, Sy
@@ -72,7 +74,7 @@ print "POLYEXT:" :POLYEXT poly, xmin, ymin, xmax, ymax
 print "PRINT:" ':PRINT [USING [format];] [expr|str [,|; [expr|str]] ...
 print "PSET:" ':PSET [STEP] x,y [, color| COLOR color]
 print "RANDOMIZE:" :RANDOMIZE 111
-print "READ:" ':READ var[, var ...]
+print "READ:" :READ VarRead1, VarRead2: if(VarRead1 != 1 OR VarRead2 != "a") then throw "READ failed"
 print "RECT:" ':RECT [STEP] x,y [,|STEP x2,y2] [, color| COLOR color] [FILLED]
 print "REDIM:" ':REDIM x
 print "RENAME:" ':RENAME "file", "newname"

samples/distro-examples/tests/output/all.out

@@ -15,7 +15,7 @@ CLOSE:
 CLS:
 COLOR:
 COPY:
-DATEDMY:
+DATEDMY:1012022
 DELAY:
 DELETE:
 DERIV:
@@ -77,7 +77,7 @@ THROW:
 TIMEHMS:
 TLOAD:
 TRON:
-<95>TROFF:
+<97>TROFF:
 TSAVE:
 VIEW:
 WINDOW:
@@ -171,7 +171,7 @@ POINT:0
 POLYAREA:0
 POLYCENT:
 POW:12.3
-PROGLINE:189
+PROGLINE:191
 PTDISTLN:0
 PTDISTSEG:0
 PTSIGN:0
@@ -222,7 +222,7 @@ TRANSLATE:source
 TRIM(s):s with spaces
 TXTH:1
 TXTW:11
-UBOUND:22
+UBOUND:18
 UCASE:CATSANDDOGS
 UPPER:CATSANDDOGS
 VAL:0

src/common/blib.c

@@ -2670,7 +2670,7 @@ void cmd_swap(void) {
 void cmd_exprseq(void) {
   var_t *var_p;
   bcip_t use_ip, exit_ip = INVALID_ADDR;
-  var_num_t xmin, xmax, dx;
+  var_num_t xmin, xmax, x, dx;
   var_int_t count;
 
   par_massget("PFFI", &var_p, &xmin, &xmax, &count);
@@ -2689,9 +2689,9 @@ void cmd_exprseq(void) {
     if (count > 1) {
       v_toarray1(var_p, count);
       dx = (xmax - xmin) / (count - 1);
-
+      x = xmin;
       // add the entries
-      for (int i = 0, x = xmin; i < count; i++, x += dx) {
+      for (int i = 0; i < count; i++, x += dx) {
         var_t *elem_p = v_elem(var_p, i);
         v_setreal(elem_p, x);
         exec_usefunc(elem_p, use_ip);