annotate libinterp/parse-tree/module.mk @ 16174:39096b290a2f

check syntax used to enable bison push/pull parser * acinclude.m4 (OCTAVE_PROG_BISON): Check for syntax used to enable push/pull parser. * common.mk (BISON_PUSH_PULL_DECL_STYLE): New variable. * libinterp/Makefile.am (BUILT_DISTFILES): Include oct-parse.yy in the list. (EXTRA_DIST): Include oct-pase.in.yy in the list. (ULT_DIST_SRC): New variable. (SRC_DEF_FILES, TST_FILES_SRC): Use $(ULT_DIST_SRC) instead of $(DIST_SRC). * find-defun-files.sh: Transform .in.yy instead of .yy. * libinterp/parse-tree/module.mk (parse-tree/oct-parse.yy): New target and rule to substitute push-pull decl. * oct-parse.in.yy: Rename from oct-parse.yy Substitute %PUSH_PULL_DECL%.
author John W. Eaton <jwe@octave.org>
date Sat, 02 Mar 2013 12:26:42 -0500
parents 3dcd96e1f657
children a8f9eb92fa6e 70f465930546
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
1 EXTRA_DIST += \
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
2 parse-tree/module.mk \
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
3 parse-tree/octave.gperf
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
4
15281
03ef3a183129 build: Use INC rather than INCLUDES for consistent naming in libinterp Makefile.am.
Rik <rik@octave.org>
parents: 15258
diff changeset
5 PARSER_INC = \
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
6 parse-tree/lex.h \
15087
20b33f227599 fix the names of parse.h and parse-private.h in module.mk file
John W. Eaton <jwe@octave.org>
parents: 15085
diff changeset
7 parse-tree/parse.h \
20b33f227599 fix the names of parse.h and parse-private.h in module.mk file
John W. Eaton <jwe@octave.org>
parents: 15085
diff changeset
8 parse-tree/parse-private.h
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
9
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
10 PARSER_SRC = \
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
11 parse-tree/lex.ll \
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
12 parse-tree/oct-parse.yy
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
13
15413
3dcd96e1f657 build: Comment and add FIXME notes for automake rules which never fire.
Rik <rik@octave.org>
parents: 15281
diff changeset
14 ## FIXME: Automake does not support per-object rules.
3dcd96e1f657 build: Comment and add FIXME notes for automake rules which never fire.
Rik <rik@octave.org>
parents: 15281
diff changeset
15 ## These rules could be emulated by creating a new convenience
3dcd96e1f657 build: Comment and add FIXME notes for automake rules which never fire.
Rik <rik@octave.org>
parents: 15281
diff changeset
16 ## library and using per-library rules. Or we can just live
3dcd96e1f657 build: Comment and add FIXME notes for automake rules which never fire.
Rik <rik@octave.org>
parents: 15281
diff changeset
17 ## with the extra warnings about old-sytle-casts. (09/18/2012)
3dcd96e1f657 build: Comment and add FIXME notes for automake rules which never fire.
Rik <rik@octave.org>
parents: 15281
diff changeset
18 #lex.lo lex.o oct-parse.lo oct-parse.o: \
3dcd96e1f657 build: Comment and add FIXME notes for automake rules which never fire.
Rik <rik@octave.org>
parents: 15281
diff changeset
19 # AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS))
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
20
15281
03ef3a183129 build: Use INC rather than INCLUDES for consistent naming in libinterp Makefile.am.
Rik <rik@octave.org>
parents: 15258
diff changeset
21 PARSE_TREE_INC = \
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
22 parse-tree/pt-all.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
23 parse-tree/pt-arg-list.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
24 parse-tree/pt-assign.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
25 parse-tree/pt-binop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
26 parse-tree/pt-bp.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
27 parse-tree/pt-cbinop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
28 parse-tree/pt-cell.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
29 parse-tree/pt-check.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
30 parse-tree/pt-cmd.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
31 parse-tree/pt-colon.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
32 parse-tree/pt-const.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
33 parse-tree/pt-decl.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
34 parse-tree/pt-eval.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
35 parse-tree/pt-except.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
36 parse-tree/pt-exp.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
37 parse-tree/pt-fcn-handle.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
38 parse-tree/pt-id.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
39 parse-tree/pt-idx.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
40 parse-tree/pt-jump.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
41 parse-tree/pt-loop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
42 parse-tree/pt-mat.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
43 parse-tree/pt-misc.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
44 parse-tree/pt-pr-code.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
45 parse-tree/pt-select.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
46 parse-tree/pt-stmt.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
47 parse-tree/pt-unop.h \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
48 parse-tree/pt-walk.h \
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
49 parse-tree/pt.h \
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
50 parse-tree/token.h \
15281
03ef3a183129 build: Use INC rather than INCLUDES for consistent naming in libinterp Makefile.am.
Rik <rik@octave.org>
parents: 15258
diff changeset
51 $(PARSER_INC)
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
52
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
53 PARSE_TREE_SRC = \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
54 parse-tree/pt-arg-list.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
55 parse-tree/pt-assign.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
56 parse-tree/pt-binop.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
57 parse-tree/pt-bp.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
58 parse-tree/pt-cbinop.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
59 parse-tree/pt-cell.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
60 parse-tree/pt-check.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
61 parse-tree/pt-cmd.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
62 parse-tree/pt-colon.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
63 parse-tree/pt-const.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
64 parse-tree/pt-decl.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
65 parse-tree/pt-eval.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
66 parse-tree/pt-except.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
67 parse-tree/pt-exp.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
68 parse-tree/pt-fcn-handle.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
69 parse-tree/pt-id.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
70 parse-tree/pt-idx.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
71 parse-tree/pt-jump.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
72 parse-tree/pt-loop.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
73 parse-tree/pt-mat.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
74 parse-tree/pt-misc.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
75 parse-tree/pt-pr-code.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
76 parse-tree/pt-select.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
77 parse-tree/pt-stmt.cc \
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
78 parse-tree/pt-unop.cc \
15085
28f5f4a4a80a maint: Move parser code and rules to parse-tree/ directory
Rik <rik@octave.org>
parents: 15057
diff changeset
79 parse-tree/pt.cc \
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
80 parse-tree/token.cc \
15107
03381a36f70d generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
81 $(PARSER_SRC)
15057
46b19589b593 maint: Partition src/ directory with more code in subdirs.
Rik <rik@octave.org>
parents:
diff changeset
82
15096
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
83 ## Special rules for sources which must be built before rest of compilation.
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
84
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
85 ## Don't use a pipeline to process gperf output since if gperf
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
86 ## is missing but sed is not, the exit status of the pipeline
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
87 ## will still be success and we will end up creating an empty
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
88 ## oct-gperf.h file.
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
89 parse-tree/oct-gperf.h: parse-tree/octave.gperf
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
90 $(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
91 $(SED) 's,lookup\[,gperf_lookup[,' < $@-t1 > $@-t
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
92 mv $@-t $@
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
93 rm -f $@-t1
909a2797935b maint: Move interp source code without DEFUNs to interp-core/ dir.
Rik <rik@octave.org>
parents: 15087
diff changeset
94
16174
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
95 parse-tree/oct-parse.yy: parse-tree/oct-parse.in.yy
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
96 case "$(BISON_PUSH_PULL_DECL_STYLE)" in \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
97 *quote*) quote='"' ;; \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
98 *) quote="" ;; \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
99 esac; \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
100 case "$(BISON_PUSH_PULL_DECL_STYLE)" in \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
101 *dash*) decl="%define api.push-pull $${quote}both$${quote}"; ;; \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
102 *underscore*) decl="%define api.push_pull $${quote}both$${quote}"; ;; \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
103 esac; \
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
104 $(SED) "s/%PUSH_PULL_DECL%/$$decl/" $< > $@-t
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
105 mv $@-t $@
39096b290a2f check syntax used to enable bison push/pull parser
John W. Eaton <jwe@octave.org>
parents: 15413
diff changeset
106
15107
03381a36f70d generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
107 noinst_LTLIBRARIES += parse-tree/libparse-tree.la
03381a36f70d generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
108
03381a36f70d generate convenience libraries for new parse-tree and interpfcn subdirectories
John W. Eaton <jwe@octave.org>
parents: 15096
diff changeset
109 parse_tree_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC)
15258
cd8248cc6020 Use -DOCTINTERP_DLL when compiling convenience libaries in libinterp.
Michael Goffioul <michael.goffioul@gmail.com>
parents: 15195
diff changeset
110 parse_tree_libparse_tree_la_CPPFLAGS = $(liboctinterp_la_CPPFLAGS)