Merge pull request stepcode#456 from starseeker/develop

starseeker · web-flow · commit 111d7e94b04b · 2023-09-02T20:15:42.000-04:00
Fixes for newer clang compilers and more robust parallel building
diff --git a/cmake/FindLEMON.cmake b/cmake/FindLEMON.cmake
@@ -141,7 +141,7 @@ if (LEMON_EXECUTABLE)
 
       # execute lemon
       add_custom_command(
-	OUTPUT ${_out_src_file}
+	OUTPUT ${_out_src_file} ${_basename}.h
 	COMMAND ${LEMON_EXECUTABLE} -T${LEMON_TEMPLATE} ${LEMON_EXECUTABLE_opts} ${_in_y_file}
 	DEPENDS ${Name}_input_cpy
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
@@ -152,7 +152,7 @@ if (LEMON_EXECUTABLE)
       add_custom_command(
 	OUTPUT ${_out_hdr_file}
 	COMMAND ${CMAKE_COMMAND} ARGS -E rename ${_basename}.h ${_out_hdr_file}
-	DEPENDS ${_out_src_file}
+	DEPENDS ${_out_src_file} ${_basename}.h
 	WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 	)
 
diff --git a/include/express/object.h b/include/express/object.h
@@ -68,7 +68,7 @@
 /***************************/
 
 struct Object {
-    struct Symbol_ * ( *get_symbol )();
+    struct Symbol_ * ( *get_symbol )( void * );
     char * type; /**< should complete the phrase "X is ..." - i.e., "an entity", "a type", "of unknown type" */
     int bits;   /**< a bitwise selector of a type, i.e. OBJ_XX_BITS */
 };
diff --git a/src/express/expparse.y b/src/express/expparse.y
@@ -51,7 +51,7 @@ YYSTYPE yylval;
     Express yyexpresult;    /* hook to everything built by parser */
 
     Symbol *interface_schema;    /* schema of interest in use/ref clauses */
-    void (*interface_func)();    /* func to attach rename clauses */
+    void (*interface_func)(struct Scope_ *, Symbol *, Symbol *, Symbol *);    /* func to attach rename clauses */
 
     /* record schemas found in a single parse here, allowing them to be */
     /* differentiated from other schemas parsed earlier */
@@ -106,7 +106,7 @@ YYSTYPE yylval;
 
 #define ERROR(code)    ERRORreport(code, yylineno)
 
-void parserInitState()
+void parserInitState( void )
 {
     scope = scopes;
     /* no need to define scope->this */
@@ -402,8 +402,7 @@ aggregate_type(A) ::= TOK_AGGREGATE TOK_OF parameter_type(B).
         Symbol sym;
         sym.line = yylineno;
         sym.filename = current_filename;
-        ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym,
-        CURRENT_SCOPE_NAME);
+        ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym, CURRENT_SCOPE_NAME);
     }
 }
 aggregate_type(A) ::= TOK_AGGREGATE TOK_COLON TOK_IDENTIFIER(B) TOK_OF
diff --git a/src/express/expscan.l b/src/express/expscan.l
@@ -98,9 +98,12 @@
  *
  * Revision 4.1  90/09/13  16:29:00  clark
  * BPR 2.1 alpha
- * 
+ *
  */
-
+#include <ctype.h>
+#if !defined(isascii) && defined(__isascii)
+#  define isascii __isascii
+#endif
 #include "express/basic.h"
 #include "express/error.h"
 #include "express/lexact.h"
diff --git a/src/express/generated/expparse.c b/src/express/generated/expparse.c
@@ -57,7 +57,7 @@ YYSTYPE yylval;
     Express yyexpresult;    /* hook to everything built by parser */
 
     Symbol *interface_schema;    /* schema of interest in use/ref clauses */
-    void (*interface_func)();    /* func to attach rename clauses */
+    void (*interface_func)(struct Scope_ *, Symbol *, Symbol *, Symbol *);    /* func to attach rename clauses */
 
     /* record schemas found in a single parse here, allowing them to be */
     /* differentiated from other schemas parsed earlier */
@@ -112,7 +112,7 @@ YYSTYPE yylval;
 
 #define ERROR(code)    ERRORreport(code, yylineno)
 
-void parserInitState()
+void parserInitState( void )
 {
     scope = scopes;
     /* no need to define scope->this */
@@ -2348,8 +2348,7 @@ static void yy_reduce(
         Symbol sym;
         sym.line = yylineno;
         sym.filename = current_filename;
-        ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym,
-        CURRENT_SCOPE_NAME);
+        ERRORreport_with_symbol(UNLABELLED_PARAM_TYPE, &sym, CURRENT_SCOPE_NAME);
     }
 }
 #line 2356 "expparse.c"
diff --git a/src/express/generated/expscan.c b/src/express/generated/expscan.c
@@ -99,6 +99,10 @@
 * Revision 4.1 90/09/13 16:29:00 clark
 * BPR 2.1 alpha
 * */
+#include <ctype.h>
+#if !defined(isascii) && defined(__isascii)
+#  define isascii __isascii
+#endif
 #include "express/basic.h"
 #include "express/error.h"
 #include "express/lexact.h"
@@ -617,7 +621,7 @@ getTokenText(perplex_t scanner)
 #define      yyextra  scanner->extra
 
 static perplex_t
-newScanner()
+newScanner(void)
 {
     perplex_t scanner;
     scanner = (perplex_t)calloc(1, sizeof(struct perplex));
