#98

.github/workflows/linux.yml

@@ -176,6 +176,12 @@ jobs:
         make release prepare_deb
         echo "$(cat ./.PKGLABEL)" >> $GITHUB_ENV
 
+    - name: Ubuntu, unit-test
+      if: startsWith(matrix.config.name, 'Ubuntu Latest')
+      shell: bash
+      run: |
+        make release unittest
+
     # https://github.com/marketplace/actions/build-deb-action
     - name: Ubuntu, deb
       id: deb

Makefile.in

@@ -1,5 +1,5 @@
 # -*- mode: mak; -*-
-# $Id: Makefile.in,v 1.80 2025/01/13 14:57:54 cvsuser Exp $
+# $Id: Makefile.in,v 1.81 2025/01/17 19:07:47 cvsuser Exp $
 # GRIEF - top level makefile.
 #
 # Copyright (c) 1998 - 2025, Adam Young.
@@ -142,31 +142,32 @@ define usage =
 	|\n\
 	| Targets: \n\
 	|\n\
-	|	contrib - build third-party components. \n\
-	|	build   - build everything. \n"
+	|	contrib  - build third-party components. \n\
+	|	build    - build everything. \n\
+	|	unittest - execute unit tests. \n"
 endef
 
 ifneq ("", "@prefix@")
-usage+="|	install - install; see profile below. \n"
+usage+="|	install  - install; see profile below. \n"
 else
-usage+="|	package - build package. \n"
+usage+="|	package  - build package. \n"
 endif
 
-usage+="|	clean   - delete everything which can be remade. \n\
-	|	vclean  - delete all. \n\
-	|	help    - command line usage. \n\
+usage+="|	clean    - delete everything which can be remade. \n\
+	|	vclean   - delete all. \n\
+	|	help     - command line usage. \n\
 	|\n"
 
 ifneq ("", "@prefix@")
 usage+="| Install configuration: \n\
 	|\n\
-	|	BINDIR  - $(BINDIR) \n\
-	|	DATADIR - $(DATADIR) \n\
+	|	BINDIR   - $(BINDIR) \n\
+	|	DATADIR  - $(DATADIR) \n\
 	|\n\
 	| Default run-time configuration: \n\
 	|\n\
-	|	GRPATH  - $(DATADIR)/macros \n\
-	|	GRHELP  - $(DATADIR)/help \n\
+	|	GRPATH   - $(DATADIR)/macros \n\
+	|	GRHELP   - $(DATADIR)/help \n\
 	|\n"
 endif
 
@@ -184,8 +185,8 @@ $(error build type expected as first target; see "make help" for details)
 endif
 endif
 
-.PHONY:				help clean vclean distclean build package install prepare_deb prepare_rpm
-help clean vclean distclean build package install prepare_deb prepare_rpm:
+.PHONY:				help clean vclean distclean build unittest package install prepare_deb prepare_rpm
+help clean vclean distclean build unittest package install prepare_deb prepare_rpm:
 ifeq ("$(BUILD_TYPES)","")
 	$(usage)
 else
@@ -437,6 +438,11 @@ $(D_BIN)/$(PLBRNAME).dll:	$(LIBPLBRPATH)
 		@$(CP) -f $(subst /,\,$^) $@
 endif
 
+.PHONY:		unittest
+unittest:	build
+	-$(D_BIN)/gr$(E) -DGRPATH=./macros -DGRHELP=./help --config
+	$(D_BIN)/gr$(E) -DGRPATH=./macros -DGRHELP=./help --headless=unittest
+
 .PHONY:		package
 package:	import packageinfo
 	$(INNO) ./win32/gr-inno-setup.iss

gr/builtin.c

@@ -1,8 +1,8 @@
 #include <edidentifier.h>
-__CIDENT_RCSID(gr_builtin_c,"$Id: builtin.c,v 1.72 2024/12/09 14:13:08 cvsuser Exp $")
+__CIDENT_RCSID(gr_builtin_c,"$Id: builtin.c,v 1.73 2025/01/17 12:38:29 cvsuser Exp $")
 
 /* -*- mode: c; indent-width: 4; -*- */
-/* $Id: builtin.c,v 1.72 2024/12/09 14:13:08 cvsuser Exp $
+/* $Id: builtin.c,v 1.73 2025/01/17 12:38:29 cvsuser Exp $
  * Builtin expresssion evaluation.
  *
  *
@@ -110,7 +110,7 @@ iscsym(int c) /*TODO: compat_iscsym()*/
 
 /*
  *  execute_str ---
- *      Take a string, possiblity entered via the the command prompt, taking the
+ *      Take a string, possibly entered via the command prompt, taking the
  *      form <macro [arguments ... ]>, parse and then execute the specified macro.
  *
  *      Arguments can be either int, float otherwise treated as a string.
@@ -280,7 +280,7 @@ void
 execute_unassigned(const char *spec, int key, const char *seq)
 {
     //
-    //  TODO: general execute_key(), precompile during assign_to_key()
+    //  TODO: general execute_key(), pre-compile during assign_to_key()
     //
 #define UNASSIGNED_ARGV 16