Merge pull request #5 from thwill1000/thwill-alpha5

Merge thwill-alpha5 branch into main

Author: thwill1000

CMakeLists.txt

@@ -21,20 +21,24 @@ FetchContent_MakeAvailable(googletest)
 add_definitions(-funsigned-char)
 
 if (MMB4L_COVERAGE)
+    message("** Configuring with code-coverage")
     set(GCC_COVERAGE_COMPILE_FLAGS "-fprofile-arcs -ftest-coverage")
     set(GCC_COVERAGE_LINK_FLAGS    "-lgcov")
     set(GCOV_LINK_LIBRARY          gcov)
 endif()
 
-set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} -Wwrite-strings")
-set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} -Wwrite-strings")
+set(XTRA_WARNING_FLAGS "-Wwrite-strings -Wall -Wextra -Wno-unused-parameter -Wno-missing-field-initializers -Wno-unused-function -Wno-unused-result -Werror")
+set(CMAKE_C_FLAGS  "${CMAKE_C_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${XTRA_WARNING_FLAGS}")
+set(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_COVERAGE_COMPILE_FLAGS} ${XTRA_WARNING_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS  "${CMAKE_EXE_LINKER_FLAGS} ${GCC_COVERAGE_LINK_FLAGS}")
 
 set(MMB4L_CORE_SOURCE_FILES
+    src/core/Commands.c
+    src/core/Functions.c
+    src/core/funtbl.c
     src/core/MMBasic.c
     src/core/Operators.c
-    src/core/Functions.c
-    src/core/Commands.c
+    src/core/vartbl.c
 )
 
 set(MMB4L_COMMANDS_SOURCE_FILES
@@ -50,6 +54,7 @@ set(MMB4L_COMMANDS_SOURCE_FILES
     src/commands/cmd_dummy.c
     src/commands/cmd_edit.c
     src/commands/cmd_end.c
+    src/commands/cmd_erase.c
     src/commands/cmd_error.c
     src/commands/cmd_execute.c
     src/commands/cmd_files.c
@@ -190,6 +195,8 @@ add_executable(
   test_cmdline
   src/common/cmdline.c
   src/common/cstring.c
+  src/common/memory.c
+  src/common/parse.c
   src/common/gtest/cmdline_test.cxx
 )
 
@@ -203,6 +210,34 @@ target_link_libraries(
 
 gtest_discover_tests(test_cmdline)
 
+################################################################################
+# test_cmd_run
+################################################################################
+
+add_executable(
+  test_cmd_run
+  src/commands/cmd_run.c
+  src/commands/gtest/cmd_run_test.cxx
+  src/common/cstring.c
+  src/common/memory.c
+  src/common/mmresult.c
+  src/common/parse.c
+  src/core/funtbl.c
+  src/core/MMBasic.c
+  src/core/vartbl.c
+  src/functions/fun_mmcmdline.c
+)
+
+target_link_libraries(
+  test_cmd_run
+  gtest_main
+  gmock
+  gmock_main
+  ${GCOV_LINK_LIBRARY}
+)
+
+gtest_discover_tests(test_cmd_run)
+
 ################################################################################
 # test_cstring
 ################################################################################
@@ -222,6 +257,43 @@ target_link_libraries(
 
 gtest_discover_tests(test_cstring)
 
+################################################################################
+# test_funtbl
+################################################################################
+
+add_executable(
+  test_funtbl
+  src/core/funtbl.c
+  src/core/gtest/funtbl_test.cxx
+)
+
+target_link_libraries(
+  test_funtbl
+  gtest_main
+  gmock
+  gmock_main
+)
+
+gtest_discover_tests(test_funtbl)
+
+################################################################################
+# test_hash
+################################################################################
+
+add_executable(
+  test_hash
+  src/common/gtest/hash_test.cxx
+)
+
+target_link_libraries(
+  test_hash
+  gtest_main
+  gmock
+  gmock_main
+)
+
+gtest_discover_tests(test_hash)
+
 ################################################################################
 # test_options
 ################################################################################
@@ -255,6 +327,7 @@ gtest_discover_tests(test_options)
 add_executable(
   test_parse
   src/common/cstring.c
+  src/common/memory.c
   src/common/parse.c
   src/common/gtest/parse_test.cxx
 )
@@ -312,6 +385,27 @@ target_link_libraries(
 
 gtest_discover_tests(test_program)
 
+################################################################################
+# test_prompt
+################################################################################
+
+add_executable(
+  test_prompt
+  src/common/cstring.c
+  src/common/prompt.c
+  src/common/gtest/prompt_test.cxx
+)
+
+target_link_libraries(
+  test_prompt
+  gtest_main
+  gmock
+  gmock_main
+  ${GCOV_LINK_LIBRARY}
+)
+
+gtest_discover_tests(test_prompt)
+
 ################################################################################
 # test_rx_buf
 ################################################################################
@@ -331,3 +425,56 @@ target_link_libraries(
 )
 
 gtest_discover_tests(test_rx_buf)
+
+################################################################################
+# test_mmbasic_core
+################################################################################
+
+add_executable(
+  test_mmbasic_core
+  src/common/cstring.c
+  src/common/file.c
+  src/common/interrupt.c
+  src/common/memory.c
+  src/common/mmresult.c
+  src/common/mmtime.c
+  src/common/parse.c
+  src/common/path.c
+  src/common/program.c
+  src/common/rx_buf.c
+  src/common/serial.c
+  src/core/funtbl.c
+  src/core/MMBasic.c
+  src/core/vartbl.c
+  src/core/gtest/mmbasic_core_test.cxx
+)
+
+target_link_libraries(
+  test_mmbasic_core
+  gtest_main
+  gmock
+  gmock_main
+  ${GCOV_LINK_LIBRARY}
+)
+
+gtest_discover_tests(test_mmbasic_core)
+
+################################################################################
+# test_vartbl
+################################################################################
+
+add_executable(
+  test_vartbl
+  src/core/vartbl.c
+  src/core/gtest/vartbl_test.cxx
+)
+
+target_link_libraries(
+  test_vartbl
+  gtest_main
+  gmock
+  gmock_main
+  ${GCOV_LINK_LIBRARY}
+)
+
+gtest_discover_tests(test_vartbl)

ChangeLog

@@ -1,6 +1,84 @@
 ChangeLog
 ---------
 
+Version 0.5.0 - 3-Feb-2023:
+  - Changed to semantic versioning scheme.
+    Note that MMB4L is still versioned independently of Geoff and Peter's
+    "mainline" MMBasic platforms.
+        - MM.INFO(VERSION) will return the integer 5000000 for this release,
+          divide by 10000000 to get float equivalent, e.g. 0.5
+        - MM.INFO(VERSION MAJOR) will return major version, 0 for this release.
+        - MM.INFO(VERSION MINOR) will return minor version, 5 for this release.
+        - MM.INFO(VERSION MICRO) will return minor/patch version, 0 for this
+          release.
+        - MM.INFO(VERSION BUILD) will return the build number, 0 for this
+          release and only included for use in some theoretical future.
+  - Added "automatic path completion" to the MMBasic prompt.
+        - Pressing TAB will attempt to complete (as far as can be unambiguously
+          determined) a filename that the user is typing at the prompt, or sound
+          the console bell if no completion is possible.
+  - Added MM.INFO(CALLDEPTH) to return the current function/subroutine call
+    depth.
+        - 0 when at the global level, i.e. not in a function/subroutine.
+        - Primarily for debugging purposes, though a possible production
+          use-case would be to allow a program to "bail out" if recursion gets
+          too deep.
+  - Added MM.INFO(PID) to get the process ID of the MM4L process.
+  - Added MM.INFO(CPUTIME) to get the value (in nanoseconds) of the CPU timer
+    for the MMB4L process.
+  - Changed function, label, subroutine and variable lookup to use hashmap.
+        - Depending on the problem this might be expected to produce a 3-5%
+          improvement in performance.
+  - Changed syntax of RUN command to:
+        RUN [file$] [, cmdline$]
+    Both file$ and cmdline$ can now be string expressions instead of
+    the legacy behaviour where the command line argument was "not processed" by
+    MMBasic and was copied verbatim into the MM.CMDLINE$ of the new program.
+        - This change means that cmdline$ can now be constructed from other
+          variables and functions instead of having to be hardcoded, or
+          finessed by using EXECUTE to construct the RUN statement.
+        - If the text following the comma contains an unquoted minus sign then
+          for backward compatibility MMB4L trys to use the legacy behaviour,
+          but this does not work for all possible legacy command lines.
+    Note that the behaviour of the * command is unchanged; expressions in any
+    command line provided via * are not evaluated by MMB4L, e.g.
+        *foo a$ + b$
+    is equivalent to:
+        RUN "foo", "a$ + b$"
+  - Changed RUN file$ so that it is not necessary for file$ to have a ".bas"
+    extension.
+        - If file$ does not exist then will try appending the extensions
+          ".bas", ".BAS" and ".Bas" in turn.
+  - Changed #INCLUDE "<file>" so that it is not necessary for <file> to have
+    a ".inc" extension.
+        - If <file> does not exist then will try appending the extension
+          ".inc", ".INC" and ".Inc" in turn.
+  - Changed XMODEM to improve read/write performance.
+        - It now reads/writes 128 characters at a time instead of 1.
+  - Changed MMBasic prompt so that you can access the history with the up
+    and down cursors even after you start typing a command.
+  - Changed some error messages to be clearer and/or more specific.
+  - Changed "mmbasic.syntax.nanorc" to improve syntax highlighting of comments.
+        - Even so it is still not 100% correct.
+  - Fixed bug where relative #INCLUDE files could not be found when running
+    a symbolic link to an MMBasic file.
+        - The path to the #INCLUDE files was incorrectly being resolved relative
+          to the parent of the symbolic link instead of the parent of the target
+          file.
+  - Fixed several bugs with identifiers allowing / being limited to 32
+    characters (not including variable/function type suffix).
+  - Fixed bug with GOSUB/RETURN corrupting the interpreter state when using
+    ON ERROR SKIP.
+  - Fixed bug where function returns corrupted the interpreter state when using
+    ON ERROR SKIP.
+  - Fixed bug where an "Internal fault" error would be reported immediately if
+    the console/tty dimensions could not be determined when displaying the
+    MMBasic prompt.
+        - This can be a transient problem so MMB4L now retries for 1 second
+          before reporting a "Cannot determine terminal size" error.
+  - Fixed bug in OPTION LIST for F<num> function key options whose values
+    contained carriage-return character.
+
 Version 2022.01.00-a4 - 15-May-2022:
   - MMB4L is now open-source and licensed under a modified 4-clause BSD license
     similar to that for the PicoMite firmware and MMBasic for Windows. See the

LICENSE.MIT

@@ -12,7 +12,7 @@ MMBasic for Linux (MMB4L)
 
 MIT License
 
-Copyright (c) 2020-2022 Thomas Hugo Williams
+Copyright (c) 2020-2023 Thomas Hugo Williams
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

LICENSE.MMBasic

@@ -1,7 +1,7 @@
 MMBasic for Linux (MMB4L)
 =========================
 
-Copyright 2021-2022 Geoff Graham, Peter Mather and Thomas Hugo Williams.
+Copyright 2021-2023 Geoff Graham, Peter Mather and Thomas Hugo Williams.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are met: