Remove all syntax extensions and estring

Makefile

@@ -30,17 +30,13 @@ QTESTDIR ?= qtest
 INSTALL_FILES = _build/META _build/src/*.cma \
 	battop.ml _build/src/*.cmi _build/src/*.mli \
 	_build/src/batteriesHelp.cmo _build/src/batteriesConfig.cmo _build/src/batteriesPrint.cmo \
-	_build/src/syntax/pa_comprehension/pa_comprehension.cmo \
-	_build/src/syntax/pa_strings/pa_strings.cma \
-	_build/src/syntax/pa_llist/pa_llist.cmo \
 	_build/libs/*.cmi _build/libs/*.mli \
 	ocamlinit build/ocaml
 OPT_INSTALL_FILES = _build/src/*.cmx _build/src/*.a _build/src/*.cmxa \
 	_build/src/*.cmxs _build/src/*.lib _build/libs/*.cmx
 
 # What to build
-TARGETS = syntax.otarget
-TARGETS += src/batteries.cma
+TARGETS  = src/batteries.cma
 TARGETS += src/batteriesHelp.cmo
 TARGETS += src/batteriesThread.cma
 TARGETS += META
@@ -93,16 +89,10 @@ man: all batteries.odocl
 	ocamlfind ocamldoc -package threads.posix -sort -man -hide-warnings -d man -I _build/libs -I _build/src libs/uniclib.mli src/*.mli
 
 install: all uninstall_packages
-	ocamlfind install estring \
-		libs/estring/META \
-		_build/libs/estring/*.cmo \
-		_build/libs/estring/*.cmi \
-		_build/libs/estring/*.mli
 	ocamlfind install $(NAME) $(INSTALL_FILES) \
 		-optional $(OPT_INSTALL_FILES)
 
 uninstall_packages:
-	ocamlfind remove estring
 	ocamlfind remove $(NAME)
 
 uninstall: uninstall_packages
@@ -154,7 +144,7 @@ _build/testsuite/main.native: $(TESTDEPS) $(wildcard testsuite/*.ml)
 
 # extract all qtest unit tests into a single ml file
 $(QTESTDIR)/all_tests.ml: $(TESTABLE)
-	qtest -o $@ --shuffle --preamble-file qtest_preamble.ml extract $(TESTABLE)
+	qtest -o $@ --shuffle --preamble-file qtest/qtest_preamble.ml extract $(TESTABLE)
 
 _build/$(QTESTDIR)/all_tests.byte: $(QTESTDIR)/all_tests.ml
 	$(OCAMLBUILD) $(OCAMLBUILDFLAGS) -cflags -warn-error,+26 -use-ocamlfind -pkg oUnit,QTest2Lib $(QTESTDIR)/all_tests.byte

README.folders

@@ -4,6 +4,5 @@ The following directories contain:
 * examples/   example files showing how to use various features of batteries
 * apidocs/    the html documentation
 * src/	      the core of Batteries Included, all the batFoo modules
-* src/syntax/ several syntax extensions for OCaml
 * testsuite/  a minimal testsuite for batteries
 

_tags

@@ -3,7 +3,6 @@
 "build": include
 "src": include
 "libs": include
-"libs/estring": include
 "testsuite": include
 "qtest": include
 "benchsuite": include

battop.ml

@@ -31,9 +31,6 @@
    This file is loaded by the magic line in the ocamlinit file.
 *)
 
-(* Set the below to false to disable use of syntax extensions in toplevel *)
-let ext_syntax = true;;
-
 
 (* END CONFIGURATION *)
 
@@ -78,15 +75,3 @@ open Batteries;;
 #install_printer BatteriesPrint.string_enum;;
 #install_printer BatteriesPrint.rope_enum;;
 #install_printer BatteriesPrint.char_enum;;
-
-
-if ext_syntax then begin
-  if !Sys.interactive then
-    print_endline "Loading syntax extensions...";
-  Topfind.standard_syntax();
-  Topfind.load_deeply ["dynlink"; "camlp4"; "batteries.pa_string.syntax";
-   		       "batteries.pa_comprehension.syntax"];
-end else
-  if !Sys.interactive then
-    print_endline "Batteries Syntax extensions disabled.";
-;;