Mercurial > hg > octave-lojdl
changeset 15085:28f5f4a4a80a
maint: Move parser code and rules to parse-tree/ directory
* src/Makefile.am: Remove rules for parser code.
* parse-tree/module.mk: Add rules for parser code.
* lex.h, lex.ll, oct-parse.yy, parse-private.h, parse.h: Move
files from src/ to parse-tree/ directory.
| author | Rik <rik@octave.org> |
|---|---|
| date | Thu, 02 Aug 2012 17:10:26 -0700 |
| parents | ea5e02b14853 |
| children | a782752adcf3 |
| files | src/Makefile.am src/lex.h src/lex.ll src/oct-parse.yy src/parse-private.h src/parse-tree/lex.h src/parse-tree/lex.ll src/parse-tree/module.mk src/parse-tree/oct-parse.yy src/parse-tree/parse-private.h src/parse-tree/parse.h src/parse.h |
| diffstat | 7 files changed, 18 insertions(+), 33 deletions(-) [+] |
line wrap: on
line diff
--- a/src/Makefile.am +++ b/src/Makefile.am @@ -68,12 +68,12 @@ defaults.h \ graphics.h \ graphics-props.cc \ - lex.cc \ + parse-tree/lex.cc \ mxarray.h \ oct-conf.h \ oct-errno.cc \ oct-gperf.h \ - oct-parse.cc \ + parse-tree/oct-parse.cc \ ops.cc \ version.h \ builtins.cc @@ -122,20 +122,6 @@ version.in.h \ $(BUILT_DISTFILES) -#OPT_HANDLERS = \ -# DASPK-opts.cc \ -# DASRT-opts.cc \ -# DASSL-opts.cc \ -# LSODE-opts.cc \ -# Quad-opts.cc -# -#OPT_INC = \ -# ../liboctave/DASPK-opts.h \ -# ../liboctave/DASRT-opts.h \ -# ../liboctave/DASSL-opts.h \ -# ../liboctave/LSODE-opts.h \ -# ../liboctave/Quad-opts.h - JIT_INCLUDES = \ jit-util.h \ jit-typeinfo.h \ @@ -165,7 +151,6 @@ gripes.h \ help.h \ input.h \ - lex.h \ load-path.h \ load-save.h \ ls-ascii-helper.h \ @@ -196,8 +181,6 @@ octave.h \ ops.h \ pager.h \ - parse.h \ - parse-private.h \ pr-output.h \ procstream.h \ profiler.h \ @@ -256,7 +239,6 @@ gripes.cc \ help.cc \ input.cc \ - lex.ll \ load-path.cc \ load-save.cc \ ls-ascii-helper.cc \ @@ -275,7 +257,6 @@ oct-lvalue.cc \ oct-map.cc \ oct-obj.cc \ - oct-parse.yy \ oct-prcstrm.cc \ oct-procbuf.cc \ oct-stream.cc \ @@ -475,13 +456,6 @@ fi mv $@-t $@ -#$(OPT_HANDLERS) : %.cc : $(top_srcdir)/liboctave/%.in $(top_srcdir)/build-aux/mk-opts.pl -# $(PERL) $(top_srcdir)/build-aux/mk-opts.pl --opt-handler-fcns $< > $@-t -# mv $@-t $@ -# -#$(OPT_INC) : %.h : %.in -# $(MAKE) -C $(@D) $(@F) - if AMCOND_ENABLE_DYNAMIC_LINKING DLDFCN_PKG_ADD_FILE = dldfcn/PKG_ADD @@ -490,9 +464,6 @@ mv $@-t $@ endif -lex.lo lex.o oct-parse.lo oct-parse.o: \ - AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS)) - __fltk_uigetfile__.lo __fltk_uigetfile__.o: \ AM_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(AM_CXXFLAGS) $(GRAPHICS_CFLAGS))
--- a/src/parse-tree/module.mk +++ b/src/parse-tree/module.mk @@ -1,6 +1,18 @@ EXTRA_DIST += \ parse-tree/module.mk +PARSER_INCLUDES = \ + parse-tree/lex.h \ + parse.h \ + parse-private.h + +PARSER_SRC = \ + parse-tree/lex.ll \ + parse-tree/oct-parse.yy + +lex.lo lex.o oct-parse.lo oct-parse.o: \ + AM_CXXFLAGS := $(filter-out -Wold-style-cast, $(AM_CXXFLAGS)) + PT_INCLUDES = \ parse-tree/pt-all.h \ parse-tree/pt-arg-list.h \ @@ -29,7 +41,8 @@ parse-tree/pt-stmt.h \ parse-tree/pt-unop.h \ parse-tree/pt-walk.h \ - parse-tree/pt.h + parse-tree/pt.h \ + $(PARSER_INCLUDES) PARSE_TREE_SRC = \ parse-tree/pt-arg-list.cc \ @@ -57,5 +70,6 @@ parse-tree/pt-select.cc \ parse-tree/pt-stmt.cc \ parse-tree/pt-unop.cc \ - parse-tree/pt.cc + parse-tree/pt.cc \ + $(PARSER_SRC)