Mercurial > octave
view libinterp/parse-tree/module.mk @ 33110:8a582d69173f
use std::variant to manage token info for the lexer
* token.h (class token::superclass_info): Define as ordinary
class with private data members, accessor functions, copy and move
constructors, and destructor.
(class token::tok_info): Derive from std::variant and store values
instead of pointers to objects allocated with new. Adapt constructors
and accessor functions as needed. Move accessor functions to header
file.
(class token): Use default copy and move constructors and destructor
definitions. Move constructors and accessor function definitions to
header file.
* token.cc: Delete file.
* libinterp/parse-tree/module.mk: Update.
author | John W. Eaton <jwe@octave.org> |
---|---|
date | Thu, 29 Feb 2024 13:46:26 -0500 |
parents | f561b6a31e02 |
children | 4cae6d1e5122 979a51024c94 |
line wrap: on
line source
PARSE_TREE_INC = \ %reldir%/anon-fcn-validator.h \ %reldir%/bp-table.h \ %reldir%/comment-list.h \ %reldir%/filepos.h \ %reldir%/lex.h \ %reldir%/oct-lvalue.h \ %reldir%/parse.h \ %reldir%/profiler.h \ %reldir%/pt-all.h \ %reldir%/pt-anon-scopes.h \ %reldir%/pt-arg-list.h \ %reldir%/pt-args-block.h \ %reldir%/pt-array-list.h \ %reldir%/pt-assign.h \ %reldir%/pt-binop.h \ %reldir%/pt-bp.h \ %reldir%/pt-cbinop.h \ %reldir%/pt-cell.h \ %reldir%/pt-check.h \ %reldir%/pt-classdef.h \ %reldir%/pt-cmd.h \ %reldir%/pt-colon.h \ %reldir%/pt-const.h \ %reldir%/pt-decl.h \ %reldir%/pt-eval.h \ %reldir%/pt-except.h \ %reldir%/pt-exp.h \ %reldir%/pt-fcn-handle.h \ %reldir%/pt-id.h \ %reldir%/pt-idx.h \ %reldir%/pt-jump.h \ %reldir%/pt-loop.h \ %reldir%/pt-mat.h \ %reldir%/pt-misc.h \ %reldir%/pt-pr-code.h \ %reldir%/pt-select.h \ %reldir%/pt-spmd.h \ %reldir%/pt-stmt.h \ %reldir%/pt-tm-const.h \ %reldir%/pt-unop.h \ %reldir%/pt-walk.h \ %reldir%/pt.h \ %reldir%/token.h ## oct-gperf.h and oct-parse.h are in the SRC list so that they will ## be distributed but not installed. PARSE_TREE_SRC = \ %reldir%/anon-fcn-validator.cc \ %reldir%/bp-table.cc \ %reldir%/comment-list.cc \ %reldir%/lex.ll \ %reldir%/oct-gperf.h \ %reldir%/oct-lvalue.cc \ %reldir%/oct-parse.h \ %reldir%/oct-parse.yy \ %reldir%/profiler.cc \ %reldir%/pt-anon-scopes.cc \ %reldir%/pt-arg-list.cc \ %reldir%/pt-args-block.cc \ %reldir%/pt-array-list.cc \ %reldir%/pt-assign.cc \ %reldir%/pt-binop.cc \ %reldir%/pt-bp.cc \ %reldir%/pt-cbinop.cc \ %reldir%/pt-cell.cc \ %reldir%/pt-check.cc \ %reldir%/pt-classdef.cc \ %reldir%/pt-colon.cc \ %reldir%/pt-const.cc \ %reldir%/pt-decl.cc \ %reldir%/pt-eval.cc \ %reldir%/pt-except.cc \ %reldir%/pt-exp.cc \ %reldir%/pt-fcn-handle.cc \ %reldir%/pt-id.cc \ %reldir%/pt-idx.cc \ %reldir%/pt-loop.cc \ %reldir%/pt-mat.cc \ %reldir%/pt-misc.cc \ %reldir%/pt-pr-code.cc \ %reldir%/pt-select.cc \ %reldir%/pt-spmd.cc \ %reldir%/pt-stmt.cc \ %reldir%/pt-tm-const.cc \ %reldir%/pt-unop.cc \ %reldir%/pt-walk.cc \ %reldir%/pt.cc ## Special rules for sources which must be built before rest of compilation. ## Don't use a pipeline to process gperf output since if gperf ## is missing but sed is not, the exit status of the pipeline ## will still be success and we will end up creating an empty ## oct-gperf.h file. %reldir%/oct-gperf.h: %reldir%/octave.gperf $(AM_V_GEN)rm -f $@-t $@t1 $@ && \ $(GPERF) -t -C -D -G -L C++ -Z octave_kw_hash $< > $@-t1 && \ $(SED) -e 's,lookup\[,gperf_lookup[,' -e 's,register ,,g' < $@-t1 > $@-t && \ mv $@-t $@ && \ rm -f $@-t1 noinst_LTLIBRARIES += \ %reldir%/libparse-tree.la %canon_reldir%_libparse_tree_la_SOURCES = $(PARSE_TREE_SRC) %canon_reldir%_libparse_tree_la_CPPFLAGS = \ $(libinterp_liboctinterp_la_CPPFLAGS) \ $(OCTAVE_PARSER_CPPFLAGS) libinterp_EXTRA_DIST += \ %reldir%/octave.gperf