Add s-expression parsing to libopen-axiom-core.a

7 files changed, 19 insertions, 28 deletions

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
index aeecfabf..fecb62bd 100644
--- a/src/lib/Makefile.in
+++ b/src/lib/Makefile.in
@@ -30,14 +30,15 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-
 core_SOURCES = \
 	bsdsignal.cxx \
 	cfuns-c.cxx \
 	sockio-c.cxx \
+	../utils/storage.cxx \
 	../io/std-streams.cxx \
 	../io/InputFragment.cxx \
 	../syntax/token.cxx \
+	../syntax/sexpr.cxx \
 	../syntax/Parser.cxx
 
 terminal_io_SOURCES = cursor.c edin.c fnct_key.c openpty.c prt.c wct.c
diff --git a/src/rt/Makefile.am b/src/rt/Makefile.am
index 8c3fdc14..90083687 100644
--- a/src/rt/Makefile.am
+++ b/src/rt/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (C) 2013-2014, Gabriel Dos Reis.
+# Copyright (C) 2013-2017, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,7 +32,9 @@
 
 noinst_PROGRAMS = lisp
 lisp_SOURCES = driver.cc
-lisp_LDADD = $(oa_target_libdir)/libOpenAxiom.a
+lisp_LDADD = \
+	$(oa_target_libdir)/libOpenAxiom.a \
+	$(oa_target_libdir)/libopen-axiom-core.a
 
 AM_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
diff --git a/src/rt/Makefile.in b/src/rt/Makefile.in
index 2f7147a0..3a4cce43 100644
--- a/src/rt/Makefile.in
+++ b/src/rt/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright (C) 2013-2014, Gabriel Dos Reis.
+# Copyright (C) 2013-2017, Gabriel Dos Reis.
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -140,7 +140,8 @@ CONFIG_CLEAN_VPATH_FILES =
 PROGRAMS = $(noinst_PROGRAMS)
 am_lisp_OBJECTS = driver.$(OBJEXT)
 lisp_OBJECTS = $(am_lisp_OBJECTS)
-lisp_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a
+lisp_DEPENDENCIES = $(oa_target_libdir)/libOpenAxiom.a \
+	$(oa_target_libdir)/libopen-axiom-core.a
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
 am__v_lt_0 = --silent
@@ -401,7 +402,10 @@ top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 void_type = @void_type@
 lisp_SOURCES = driver.cc
-lisp_LDADD = $(oa_target_libdir)/libOpenAxiom.a
+lisp_LDADD = \
+	$(oa_target_libdir)/libOpenAxiom.a \
+	$(oa_target_libdir)/libopen-axiom-core.a
+
 AM_CXXFLAGS = \
 	-I$(top_srcdir)/src/include \
 	-I$(oa_target_includedir) \
diff --git a/src/syntax/sexpr.cc b/src/syntax/sexpr.cxx
index f9d76825..f9d76825 100644
--- a/src/syntax/sexpr.cc
+++ b/src/syntax/sexpr.cxx
diff --git a/src/utils/Makefile.am b/src/utils/Makefile.am
index d2f49303..a4963851 100644
--- a/src/utils/Makefile.am
+++ b/src/utils/Makefile.am
@@ -37,10 +37,9 @@ hammer_LDADD = \
 noinst_LIBRARIES = libOpenAxiom.a
 
 libOpenAxiom_a_SOURCES = \
-	storage.cc string-pool.cc command.cc \
+	string-pool.cc command.cc \
 	filesystem.cc \
 	../io/Input.cc \
-	../syntax/sexpr.cc \
 	../rt/vm.cc \
 	../rt/Lisp.cc \
 	../rt/Database.cc
diff --git a/src/utils/Makefile.in b/src/utils/Makefile.in
index 2e2d184c..7c6d5798 100644
--- a/src/utils/Makefile.in
+++ b/src/utils/Makefile.in
@@ -145,9 +145,8 @@ am__v_AR_1 =
 libOpenAxiom_a_AR = $(AR) $(ARFLAGS)
 libOpenAxiom_a_LIBADD =
 am__dirstamp = $(am__leading_dot)dirstamp
-am_libOpenAxiom_a_OBJECTS = storage.$(OBJEXT) string-pool.$(OBJEXT) \
-	command.$(OBJEXT) filesystem.$(OBJEXT) ../io/Input.$(OBJEXT) \
-	../syntax/sexpr.$(OBJEXT) ../rt/vm.$(OBJEXT) \
+am_libOpenAxiom_a_OBJECTS = string-pool.$(OBJEXT) command.$(OBJEXT) \
+	filesystem.$(OBJEXT) ../io/Input.$(OBJEXT) ../rt/vm.$(OBJEXT) \
 	../rt/Lisp.$(OBJEXT) ../rt/Database.$(OBJEXT)
 libOpenAxiom_a_OBJECTS = $(am_libOpenAxiom_a_OBJECTS)
 PROGRAMS = $(noinst_PROGRAMS)
@@ -420,10 +419,9 @@ hammer_LDADD = \
 
 noinst_LIBRARIES = libOpenAxiom.a
 libOpenAxiom_a_SOURCES = \
-	storage.cc string-pool.cc command.cc \
+	string-pool.cc command.cc \
 	filesystem.cc \
 	../io/Input.cc \
-	../syntax/sexpr.cc \
 	../rt/vm.cc \
 	../rt/Lisp.cc \
 	../rt/Database.cc
@@ -483,14 +481,6 @@ clean-noinstLIBRARIES:
 	@: > ../io/$(DEPDIR)/$(am__dirstamp)
 ../io/Input.$(OBJEXT): ../io/$(am__dirstamp) \
 	../io/$(DEPDIR)/$(am__dirstamp)
-../syntax/$(am__dirstamp):
-	@$(MKDIR_P) ../syntax
-	@: > ../syntax/$(am__dirstamp)
-../syntax/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) ../syntax/$(DEPDIR)
-	@: > ../syntax/$(DEPDIR)/$(am__dirstamp)
-../syntax/sexpr.$(OBJEXT): ../syntax/$(am__dirstamp) \
-	../syntax/$(DEPDIR)/$(am__dirstamp)
 ../rt/$(am__dirstamp):
 	@$(MKDIR_P) ../rt
 	@: > ../rt/$(am__dirstamp)
@@ -526,7 +516,6 @@ mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f ../io/*.$(OBJEXT)
 	-rm -f ../rt/*.$(OBJEXT)
-	-rm -f ../syntax/*.$(OBJEXT)
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -535,11 +524,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@../rt/$(DEPDIR)/Database.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../rt/$(DEPDIR)/Lisp.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@../rt/$(DEPDIR)/vm.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@../syntax/$(DEPDIR)/sexpr.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/command.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filesystem.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/hammer.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/storage.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/string-pool.Po@am__quote@
 
 .cc.o:
@@ -688,8 +675,6 @@ distclean-generic:
 	-rm -f ../io/$(am__dirstamp)
 	-rm -f ../rt/$(DEPDIR)/$(am__dirstamp)
 	-rm -f ../rt/$(am__dirstamp)
-	-rm -f ../syntax/$(DEPDIR)/$(am__dirstamp)
-	-rm -f ../syntax/$(am__dirstamp)
 
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
@@ -700,7 +685,7 @@ clean-am: clean-generic clean-libtool clean-noinstLIBRARIES \
 	clean-noinstPROGRAMS mostlyclean-am
 
 distclean: distclean-am
-	-rm -rf ../io/$(DEPDIR) ../rt/$(DEPDIR) ../syntax/$(DEPDIR) ./$(DEPDIR)
+	-rm -rf ../io/$(DEPDIR) ../rt/$(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 distclean-am: clean-am distclean-compile distclean-generic \
 	distclean-tags
@@ -746,7 +731,7 @@ install-ps-am:
 installcheck-am:
 
 maintainer-clean: maintainer-clean-am
-	-rm -rf ../io/$(DEPDIR) ../rt/$(DEPDIR) ../syntax/$(DEPDIR) ./$(DEPDIR)
+	-rm -rf ../io/$(DEPDIR) ../rt/$(DEPDIR) ./$(DEPDIR)
 	-rm -f Makefile
 maintainer-clean-am: distclean-am maintainer-clean-generic
 
diff --git a/src/utils/storage.cc b/src/utils/storage.cxx
index 80cfea0d..80cfea0d 100644
--- a/src/utils/storage.cc
+++ b/src/utils/storage.cxx