Changeset 2382

Timestamp:

01/13/2010 23:41:05 (7 months ago)

Author:

bird

Message:

kash: made it build on mac os x again.

Location:

trunk/src/kash

Files:

• Makefile.kmk (modified) (5 diffs)
• arith.y (modified) (1 diff)

trunk/src/kash/Makefile.kmk

@@ -86 +86 @@
         bltin/test.c \
         \
-        $(PATH_kash)/arith.c \
-        $(PATH_kash)/arith_lex.c \
         $(PATH_kash)/builtins.c \
         $(PATH_kash)/init.c \
@@ -110 +108 @@
 
 kash_INTERMEDIATES = \
-        $(PATH_kash)/arith.h \
         $(PATH_kash)/builtins.h \
         $(PATH_kash)/nodes.h \
@@ -116 +113 @@
 kash_CLEAN = \
         $(kash_INTERMEDIATES) \
-        $(PATH_kash)/arith.c \
-        $(PATH_kash)/arith_lex.c \
         $(PATH_kash)/builtins.c \
         $(PATH_kash)/init.c \
@@ -135 +130 @@
 # Use the pregenerated code.
 #
-kash_INTERMEDIATES :=
-kash_INCS += generated
-kash_SOURCES := $(patsubst $(PATH_kash)/%,generated/%,$(kash_SOURCES))
+kash_SOURCES += \
+        $(kash_0_OUTDIR)/arith.c \
+        $(kash_0_OUTDIR)/arith_lex.c
+
+define def_copy_generated
+$$(kash_0_OUTDIR)/$(src): $(PATH_SUB_CURRENT)/generated/$(src)
+        $$(RM) -f $$@
+        $$(CP) -f $$^ $$@
+endef
+
+$(foreach src, arith.h arith.c arith_lex.c builtins.h builtins.c nodes.h nodes.c token.h init.c,\
+$(eval $(def_copy_generated)))
 
 else
+
+#
+# Generate the code on the fly.
+#
+
+USES += lex yacc
+kash_USES = lex yacc
+kash_LEXTOOL = FLEX
+kash_LEXFLAGS = -8
+#kash_YACCTOOL = BISON
+kash_YACCTOOL = YACC
+kash_YACCFLAGS = -ld
+kash_SOURCES += \
+        arith.y \
+        arith_lex.l
 
 #
@@ -150 +169 @@
 #
 BOOTSTRAP_SHELL ?= $(SHELL)
-ifndef YACC
- YACC := $(firstword $(which byacc) $(which yacc) yacc)
-endif
-
-$$(PATH_kash)/arith.h + $$(PATH_kash)/arith.c: arith.y | $$(dir $$@)
-        $(YACC) -ld $^
-        $(MV) -f y.tab.c $(PATH_kash)/arith.c
-        $(MV) -f y.tab.h $(PATH_kash)/arith.h
-
-$$(PATH_kash)/arith_lex.c: $$(kash_DEFPATH)/arith_lex.l | $$(dir $$@)
-        flex -8 -o$@ $^                     # 8-bit lex scanner for arithmetic
 
 $$(PATH_kash)/builtins.h + $$(PATH_kash)/builtins.c: \

trunk/src/kash/arith.y

@@ -191 +191 @@
 yyerror(const char *s)
 {
-   shinstance *psh = arith_psh;
+    shinstance *psh = arith_psh;
+#ifndef YYBISON /* yyerrok references yyerrstatus which is a local variable in yyparse().*/
         yyerrok;
+#endif
         yyclearin;
         arith_lex_reset();      /* reprime lex */