Feature/numberless

basic/autests/autest1008-ifelse.basic

@@ -0,0 +1,48 @@
+1 forpp=1to5: rem for petspeeder
+5 print"(clr)";
+10 x=1
+20 ifxthena=1:elsea=2
+30 print a
+40 x=0
+50 ifxthena=3:elsea=4
+60 print a
+70 ifxthena=5:rem:elsea=6
+75 print a
+80 x=1
+85 ifxthena=7:rem:elsea=8
+90 print a
+999 nextpp
+4000 data32,"#1","-spc-",38
+4010 data32,"#4","-spc-",38
+4020 data32,"#4","-spc-",38
+4030 data32,"#7","-spc-",38
+4130 data"-spc-",40
+4140 data"ready."
+4900 dataend
+4990 end
+5000 restore:gosub6000
+5010 print
+5020 meta-verbose 2
+5025 list-1
+5030 ifre=1thenprint"testresult=pass good=";n
+5040 ifre<1thenprint"testresult=fail at row=";int(-re/40)+1;"col=";-re-int(-re/40)*40+1
+5060 print"fin"
+5080 meta-verbose 0
+5085 meta-dumpstate
+5090 end
+6000 rem screen check
+6010 n=0:re=1
+6020 readd$:d=val(d$):ifd$="end"then6050
+6022 ifmid$(d$,1,1)="#"thend=0:d$=mid$(d$,2)
+6025 ifd$="-spc-"thenreadx:gosub6200:n=n-1:goto6038
+6027 ifd$<>"0"andd=0thengosub6300:n=n-1:goto6038
+6030 ifpeek(1024+n)<>dthenre=-n:print"expecting";d;"got";peek(1024+n)
+6038 ifre<1thenreturn
+6040 n=n+1:goto6020
+6050 return
+6200 fori=1tox:ifpeek(1024+n)<>32thenre=-n:return
+6210 n=n+1:next:return
+6300 fori=1tolen(d$):a$=mid$(d$,i,1):d=asc(a$)-64:ifd<0thend=d+64
+6310 ifpeek(1024+n)<>dthenre=-n:print"exp";d;"got";peek(1024+n):return
+6320 n=n+1:next
+6340 return

basic/bdayproblem2.basic

@@ -0,0 +1,13 @@
+5 dimh(365)
+7 remfori=1to365:h(i)=0:next
+10 fori=1to50:rem23*2
+20 b=int(rnd(0)*365+1)
+30 h(b)=h(b)+1
+40 next
+50 print"(clr)"
+70 print" i  n"
+100 fori=1to365
+110   t=0:forj=1to365
+120     ifh(j)>h(t)thent=j
+130   next:ift=0orh(t)>=0thenl2=lt:lt=h(t):h(t)=-1:if(l2=0andlt>0)orl2>ltthenprinti;lt
+140 next

build.xml

@@ -28,18 +28,23 @@
           depends="build.uptodate?"
           unless="build.uptodate"
           description="Maintain build-number and build-date properties.">
+	  <exec executable="git" outputproperty="git.branch"
+		   failifexecutionfails="false">
+		   <arg line="rev-parse --abbrev-ref HEAD"/>
+	   </exec>
     <propertyfile file="${version.props}"
              comment="build number and date">
       <entry key="build-number" type="int" operation="+" pattern="0000" default="0000"/>
       <entry key="build-date" type="date" value="now" pattern="yyyyMMdd-HHmm" />
       <entry key="build.user.name" value="${user.name}"/>
       <!-- COMPUTERNAME on windows? -->
       <entry key="build.computer" value="${env.COMPUTERNAME}"/>
+      <entry key="buld.branch" value="${git.branch}"/>
     </propertyfile>
     <property file="${source}/version.props"/>
     <replaceregexp file="${source}/version.java"
                          match="programVersion = (.*)"
-                         replace="programVersion = &#34;${major}.${minor}.${rev}_b${build-number}&#34;;"
+	    replace="programVersion = &#34;${major}.${minor}.${rev}_b${build-number}-${git.branch}&#34;;"
                          byline="true" />
     <echo message="Updated the build number"/>
   </target>

source/C64.java

@@ -123,6 +123,7 @@ public C64(String args[]) {
 
     // new default
     C64Screen.static_scale=2;
+    C64Screen.static_scaley=2;
     C64Screen.static_centre=true;
 
     for (int i=0; i<args.length; ++i) {
@@ -148,8 +149,10 @@ public C64(String args[]) {
           System.out.printf("  -v : version\n");
           System.out.printf("  -x : exit immediately\n");
           System.out.printf("  -1 : single size\n");
+          System.out.printf("  -y2: 1x2\n");
           System.out.printf("  -2 : double size [default]\n");
           System.out.printf("  -3 : triple size\n");
+          System.out.printf("  -80: screen width 80\n");
           System.out.printf("  -z : petspeed [default]\n");  // make this the default
           System.out.printf("  --slow    : no petspeed\n");  // make this the default
           System.out.printf("  --https   : use https for cloud\n");  // make this the default
@@ -178,13 +181,22 @@ public C64(String args[]) {
           speeder=false;
         } else if (args[i].equals("--https")) {
           cloudNet="https://futex.com.au";
+        } else if (args[i].equals("-y2")) {
+          C64Screen.static_scale=1;
+          C64Screen.static_scaley=2;
+	  //System.out.printf("%dx%d\n",C64Screen.static_scale,C64Screen.static_scaley);
         } else if (args[i].substring(0,2).equals("-1")) {
           C64Screen.static_scale=1;
+          C64Screen.static_scaley=1;
         } else if (args[i].substring(0,2).equals("-2")) {
           C64Screen.static_scale=2;
+          C64Screen.static_scaley=2;
         } else if (args[i].substring(0,2).equals("-3")) {
           //screen.setScale(3);
           C64Screen.static_scale=3;
+          C64Screen.static_scaley=3;
+        } else if (args[i].equals("-80")) {
+          C64Screen.static_maxX=80;
         } else if (args[i].substring(0,2).equals("-c")) {
           //screen.setLocationRelativeTo(null); 
           C64Screen.static_centre=true; // make this the default ?? FIX