diff options
| author | dos-reis <gdr@axiomatics.org> | 2014-11-30 06:38:18 +0000 |
|---|---|---|
| committer | dos-reis <gdr@axiomatics.org> | 2014-11-30 06:38:18 +0000 |
| commit | 172e429ef0ca254a6711d66dbeb52eae09a6dfa9 (patch) | |
| tree | 44ad89543dd4c06b481a7891ef75ccabbe1bf860 /src/boot | |
| parent | a436cd068c592428dc67217e427fa3b1b02fea81 (diff) | |
| download | open-axiom-172e429ef0ca254a6711d66dbeb52eae09a6dfa9.tar.gz | |
Misc cleanup.
Diffstat (limited to 'src/boot')
| -rw-r--r-- | src/boot/Makefile.am | 2 | ||||
| -rw-r--r-- | src/boot/Makefile.in | 4 | ||||
| -rw-r--r-- | src/boot/bemol.cc | 26 |
3 files changed, 5 insertions, 27 deletions
diff --git a/src/boot/Makefile.am b/src/boot/Makefile.am index a2bd1cf5..9a3b320a 100644 --- a/src/boot/Makefile.am +++ b/src/boot/Makefile.am @@ -74,7 +74,7 @@ bemol_SOURCES = \ bemol.cc bemol_LDADD = \ - -L$(oa_target_libdir) -lOpenAxiom + $(oa_target_libdir)/libOpenAxiom.a oa_target_bootdir = $(oa_targetdir)/boot if OA_ECL_RT diff --git a/src/boot/Makefile.in b/src/boot/Makefile.in index 6c136b1d..4d39139e 100644 --- a/src/boot/Makefile.in +++ b/src/boot/Makefile.in @@ -149,7 +149,7 @@ CONFIG_CLEAN_VPATH_FILES = PROGRAMS = $(noinst_PROGRAMS) am_bemol_OBJECTS = bemol.$(OBJEXT) bemol_OBJECTS = $(am_bemol_OBJECTS) -bemol_DEPENDENCIES = +bemol_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a AM_V_lt = $(am__v_lt_@AM_V@) am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@) am__v_lt_0 = --silent @@ -450,7 +450,7 @@ bemol_SOURCES = \ bemol.cc bemol_LDADD = \ - -L$(oa_target_libdir) -lOpenAxiom + $(oa_target_libdir)/libOpenAxiom.a oa_target_bootdir = $(oa_targetdir)/boot @OA_ECL_RT_FALSE@oa_bootsys_linkset = diff --git a/src/boot/bemol.cc b/src/boot/bemol.cc index b36b174d..64262e91 100644 --- a/src/boot/bemol.cc +++ b/src/boot/bemol.cc @@ -155,35 +155,13 @@ SourceInput::get() { // -- Decomposing source files into lexical units of information -- // -struct Locus { - OpenAxiom::LineNumber line; - OpenAxiom::ColumnIndex column; -}; - -static std::ostream& -operator<<(std::ostream& os, const Locus& l) -{ - os << '{' << l.line << ", " << l.column << '}'; - return os; -} - -struct BemolToken { - using Location = ::Locus; - OpenAxiom::TokenCategory category; - OpenAxiom::TokenValue value; - Locus start; - Locus end; - - explicit operator bool() const { return category != TokenCategory::EOS; } -}; - static std::ostream& -operator<<(std::ostream& os, const BemolToken& t) { +operator<<(std::ostream& os, const Token& t) { os << t.category << '{' << t.start << '-' << t.end << '}'; return os; } -using TokenSequence = OpenAxiom::TokenStream<BemolToken>; +using TokenSequence = OpenAxiom::TokenStream<Token>; // -- |