Fix select case by func. Closes smallbasic#83

Author: chrisws

NEWS

@@ -1 +1 @@
-For news please visit smallbasic.sourceforge.net
+For news please visit https://smallbasic.github.io

configure.ac

@@ -7,7 +7,7 @@ dnl This program is distributed under the terms of the GPL v2.0
 dnl Download the GNU Public License (GPL) from www.gnu.org
 dnl
 
-AC_INIT([smallbasic], [0.12.16])
+AC_INIT([smallbasic], [0.12.17])
 AC_CONFIG_SRCDIR([configure.ac])
 
 AC_CANONICAL_TARGET

debian/changelog

@@ -1,3 +1,8 @@
+smallbasic (0.12.17) unstable; urgency=low
+  * Various see web site
+
+ -- Chris Warren-Smith <[email protected]>  Sat, 09 Nov 2019 09:45:25 +1000
+
 smallbasic (0.12.16) unstable; urgency=low
   * Various see web site
 

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

@@ -4,19 +4,5 @@ open failed	FS(2): NO SUCH FILE OR DIRECTORY
 after try
 catch by error name
 outer after try
-
-
- * RTE-ERROR AT ../../../samples/distro-examples/tests/trycatch.bas:200 * 
-Description:
-Division by zero
-
-Stack:
- TRY: 199
- TRY: 198
- TRY: 197
- TRY: 196
- TRY: 195
- IF: 194
- IF: 193
- IF: 192
- SUB: 216
+Error: Division by zero
+End of test

samples/distro-examples/tests/trycatch.bas

@@ -213,7 +213,11 @@ if 1 == 1 then
 fi
 end
 
-stack_test
+try
+  stack_test
+catch e
+  print "Error: " + e
+end try
 
 sub manageFiles()
   sub renameFile()
@@ -229,7 +233,6 @@ sub manageFiles()
   viewFile()
 end
 
-
 try
   try
     throw "!!!error!!!"
@@ -244,3 +247,21 @@ if (inner == "!!!error!!!") then
   throw "inner still in scope"
 endif
 
+rem test for select case <udf>
+func num(n)
+  return n
+end
+select case num(10)
+case 10
+  rem success!
+case else
+  throw "fail"
+end select
+select case round(pi)
+case 3
+  rem "success!"
+case else
+  throw "fail"
+end select
+
+print "End of test"

src/common/scan.c

@@ -3567,9 +3567,9 @@ void comp_pass2_scan() {
       break;
 
     case kwSELECT:
-      // next instruction should be CASE
+      // next instruction should be CASE (or UDF)
       false_ip = comp_next_bc_peek(i + 1);
-      if (false_ip != kwCASE && false_ip != kwCASE_ELSE) {
+      if (false_ip != kwCASE && false_ip != kwCASE_ELSE && false_ip != kwTYPE_CALL_UDF) {
         sc_raise(MSG_MISSING_CASE);
         print_pass2_stack(i, kwCASE, node->level);
         return;

src/platform/android/app/build.gradle

@@ -9,8 +9,8 @@ android {
     applicationId 'net.sourceforge.smallbasic'
     minSdkVersion 16
     targetSdkVersion 28
-    versionCode 38
-    versionName "0.12.16"
+    versionCode 39
+    versionName "0.12.17"
     resConfigs "en"
   }