108.09.00

.gitignore

@@ -0,0 +1,96 @@
+
+*.cmx
+*.cmxa
+*.cma
+*.cmo
+*.cmi
+*.exe
+*.bc
+*.annot
+*.o
+*.so
+*.so.d
+*.s
+*.a
+*.depend
+_*
+*.sp?t
+config.status
+mycaml
+.DS_Store
+tmtags
+
+.git
+.transdeps
+/chroot_test_tmp
+
+/lib/packs
+/lib/**/deps
+/lib/**.mli
+/test-results*
+
+personal_compilation_ignores
+*.cp4c
+*~
+*.auto.mli
+*.aux
+*.digest
+*.fls
+*.haux
+*.htoc
+*.log
+*.omc
+*.orig
+*.rej
+*.spot
+*.toc
+*.cmp
+.*.sw[pabcdef]
+.mydeps
+inline_tests.ml
+inline_tests_runner.ml
+TAGS
+order_file_*_common.ml
+*_db_pnl_common.ml
+order_file_*_eval.ml
+_build
+
+# for new omake rules
+*.deps
+*.ml.d
+*.mli.d
+*.libdeps
+*.objdeps
+*.hg_version.c
+*.build_info.c
+hg_version.out
+stub.names
+
+# specific files
+.last_build_env
+.omakedb
+.omakedb.lock
+spec.hg
+libdeps.sexp
+libdeps.dot
+libdeps.ps
+libdeps.corrected
+ocaml_path
+.ocaml-3.10
+bisect{.itarget,.mlpack,.odocl,_pp.mlpack}
+bisect-1.1/Makefile.config
+\#*
+.\#*
+/_build
+/conv_test.byte
+/lib/lexer.ml
+/lib/parser.ml
+/lib/parser.mli
+/lib/parser_with_layout.ml
+/lib/parser_with_layout.mli
+/lib_test/conv_test
+/lib_test/sexp_test
+/setup.data
+/setup.log
+/sexp_test.byte
+/sexplib.docdir

Makefile

@@ -1,38 +1,53 @@
-# OASIS_START
-# DO NOT EDIT (digest: bc1e05bfc8b39b664f29dae8dbd3ebbb)
+# Generic Makefile for oasis project
 
-SETUP = ocaml setup.ml
+# Set to setup.exe for the release
+SETUP := setup-dev.exe
 
-build: setup.data
-	$(SETUP) -build $(BUILDFLAGS)
+# Default rule
+default: build
 
-doc: setup.data build
-	$(SETUP) -doc $(DOCFLAGS)
+# Setup for the development version
+setup-dev.exe: _oasis setup.ml
+	sed '/^#/D' setup.ml > setup_dev.ml
+	ocamlfind ocamlopt -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || 	  ocamlfind ocamlc -o $@ -linkpkg -package ocamlbuild,oasis.dynrun setup_dev.ml || true
+	rm -f setup_dev.*
 
-test: setup.data build
-	$(SETUP) -test $(TESTFLAGS)
+# Setup for the release
+setup.exe: setup.ml
+	ocamlopt.opt -o $@ $< || ocamlopt -o $@ $< || ocamlc -o $@ $<
+	rm -f setup.cmx setup.cmi setup.o setup.obj setup.cmo
 
-all: 
-	$(SETUP) -all $(ALLFLAGS)
+build: $(SETUP) setup.data
+	./$(SETUP) -build $(BUILDFLAGS)
 
-install: setup.data
-	$(SETUP) -install $(INSTALLFLAGS)
+doc: $(SETUP) setup.data build
+	./$(SETUP) -doc $(DOCFLAGS)
 
-uninstall: setup.data
-	$(SETUP) -uninstall $(UNINSTALLFLAGS)
+test: $(SETUP) setup.data build
+	./$(SETUP) -test $(TESTFLAGS)
 
-reinstall: setup.data
-	$(SETUP) -reinstall $(REINSTALLFLAGS)
+all: $(SETUP)
+	./$(SETUP) -all $(ALLFLAGS)
 
-clean: 
-	$(SETUP) -clean $(CLEANFLAGS)
+install: $(SETUP) setup.data
+	./$(SETUP) -install $(INSTALLFLAGS)
 
-distclean: 
-	$(SETUP) -distclean $(DISTCLEANFLAGS)
+uninstall: $(SETUP) setup.data
+	./$(SETUP) -uninstall $(UNINSTALLFLAGS)
 
-setup.data:
-	$(SETUP) -configure $(CONFIGUREFLAGS)
+reinstall: $(SETUP) setup.data
+	./$(SETUP) -reinstall $(REINSTALLFLAGS)
 
-.PHONY: build doc test all install uninstall reinstall clean distclean configure
+clean: $(SETUP)
+	./$(SETUP) -clean $(CLEANFLAGS)
 
-# OASIS_STOP
+distclean: $(SETUP)
+	./$(SETUP) -distclean $(DISTCLEANFLAGS)
+
+configure: $(SETUP)
+	./$(SETUP) -configure $(CONFIGUREFLAGS)
+
+setup.data: $(SETUP)
+	./$(SETUP) -configure $(CONFIGUREFLAGS)
+
+.PHONY: default build doc test all install uninstall reinstall clean distclean configure

README.md

@@ -472,7 +472,6 @@ In the case of bugs, feature requests, contributions and similar, please
 contact the maintainers:
 
   * Jane Street Capital, LLC <[email protected]>
-  * Markus Mottl <[email protected]>
 
 Up-to-date information should be available at:
 <https://bitbucket.org/yminsky/ocaml-core>

_oasis

@@ -1,14 +1,11 @@
 #AUTOGENERATED FILE; EDIT oasis.sh INSTEAD
 OASISFormat:      0.3
 Name:             sexplib
-Version:          108.08.00
+Version:          108.09.00
 Synopsis:         sexplib - automated S-expression conversion
-Authors:          Markus Mottl <[email protected]>
-Copyrights:       (C) 2010-2012 Markus Mottl <[email protected]>,
-                  (C) 2005-2012 Jane Street Capital LLC <[email protected]>,
-                  (C) 2004-2012 Martin Sandin <[email protected]>
-Maintainers:      Markus Mottl <[email protected]>,
-                  Jane Street Capital LLC <[email protected]>
+Authors:          Jane street capital
+Copyrights:       (C) 2005-2013 Jane Street Capital LLC <[email protected]>
+Maintainers:      Jane Street Capital LLC <[email protected]>
 License:          Apache-2.0
 OCamlVersion:     >= 3.12.1
 FindlibVersion:   >= 1.3.2

_tags

@@ -1,69 +1,6 @@
 # OASIS_START
-# DO NOT EDIT (digest: 7e9eeb53326c246f58f9ff3c0f3f944e)
-# Ignore VCS directories, you can use the same kind of rule outside 
-# OASIS_START/STOP if you want to exclude directories that contains 
-# useless stuff for the build process
-<**/.svn>: -traverse
-<**/.svn>: not_hygienic
-".bzr": -traverse
-".bzr": not_hygienic
-".hg": -traverse
-".hg": not_hygienic
-".git": -traverse
-".git": not_hygienic
-"_darcs": -traverse
-"_darcs": not_hygienic
-# Library sexplib
-"lib/sexplib.cmxs": use_sexplib
-"lib/conv.cmx": for-pack(Sexplib)
-"lib/conv_error.cmx": for-pack(Sexplib)
-"lib/exn_magic.cmx": for-pack(Sexplib)
-"lib/path.cmx": for-pack(Sexplib)
-"lib/pre_sexp.cmx": for-pack(Sexplib)
-"lib/sexp.cmx": for-pack(Sexplib)
-"lib/sexp_intf.cmx": for-pack(Sexplib)
-"lib/sexp_with_layout.cmx": for-pack(Sexplib)
-"lib/src_pos.cmx": for-pack(Sexplib)
-"lib/std.cmx": for-pack(Sexplib)
-"lib/type.cmx": for-pack(Sexplib)
-"lib/type_with_layout.cmx": for-pack(Sexplib)
-"lib/parser.cmx": for-pack(Sexplib)
-"lib/parser_with_layout.cmx": for-pack(Sexplib)
-"lib/lexer.cmx": for-pack(Sexplib)
-<lib/*.ml{,i}>: pkg_unix
-<lib/*.ml{,i}>: pkg_bigarray
-<lib/*.ml{,i}>: pkg_num
-# Library pa_sexp_conv
-"syntax/pa_sexp_conv.cmxs": use_pa_sexp_conv
-<syntax/*.ml{,i}>: pkg_camlp4.quotations
-<syntax/*.ml{,i}>: pkg_camlp4.extend
-<syntax/*.ml{,i}>: pkg_type_conv
-# Library sexplib_top
-"top/sexplib_top.cmxs": use_sexplib_top
-# Executable sexp_test
-"lib_test/sexp_test.byte": use_sexplib
-"lib_test/sexp_test.byte": pkg_unix
-"lib_test/sexp_test.byte": pkg_bigarray
-"lib_test/sexp_test.byte": pkg_num
-# Executable conv_test
-"lib_test/conv_test.byte": use_sexplib
-"lib_test/conv_test.byte": use_pa_sexp_conv
-"lib_test/conv_test.byte": pkg_camlp4.quotations
-"lib_test/conv_test.byte": pkg_camlp4.extend
-"lib_test/conv_test.byte": pkg_type_conv
-"lib_test/conv_test.byte": pkg_unix
-"lib_test/conv_test.byte": pkg_bigarray
-"lib_test/conv_test.byte": pkg_num
-<lib_test/*.ml{,i}>: use_sexplib
-<lib_test/*.ml{,i}>: use_pa_sexp_conv
-<lib_test/*.ml{,i}>: pkg_camlp4.quotations
-<lib_test/*.ml{,i}>: pkg_camlp4.extend
-<lib_test/*.ml{,i}>: pkg_type_conv
-<lib_test/*.ml{,i}>: pkg_unix
-<lib_test/*.ml{,i}>: pkg_bigarray
-<lib_test/*.ml{,i}>: pkg_num
 # OASIS_STOP
-<lib/pre_sexp.ml>: pp(cpp -undef -traditional -I./syntax)
+<lib/pre_sexp.ml>: pp(cpp -undef -traditional -I/mnt/local/sda1/jdimino/git/sexplib/syntax)
 <lib_test/*.ml{,i}>: syntax_camlp4o, pkg_type_conv.syntax
 <lib_test/conv_test.byte>: use_sexplib, pkg_unix, pkg_num, pkg_bigarray
 <syntax/pa_sexp_conv.ml>: syntax_camlp4o

configure

@@ -1,27 +1,5 @@
 #!/bin/sh
 
 # OASIS_START
-# DO NOT EDIT (digest: 425187ed8bfdbdd207fd76392dd243a7)
-set -e
-
-FST=true
-for i in "$@"; do 
-  if $FST; then
-    set --
-    FST=false
-  fi
-
-  case $i in
-    --*=*)
-      ARG=${i%%=*}
-      VAL=${i##*=}
-      set -- "$@" "$ARG" "$VAL"
-      ;;
-    *)
-      set -- "$@" "$i"
-      ;;
-  esac
-done
-
-ocaml setup.ml -configure "$@"
+make configure CONFIGUREFLAGS="$*"
 # OASIS_STOP

lib/lexer.mll

@@ -116,9 +116,6 @@ rule main buf = parse
         tok
       }
   | "|#" { main_failure lexbuf "illegal end of comment" }
-  (* XCR nlinger for vgatien-baron: please add TESTs for these new cases
-
-     vgatien-baron: I did that already. Look in ../lib_test/parser_test.ml *)
   | "#" "#"+ "|" unquoted* (* unquoted_start can match ##, so ##| (which should be
                               refused) would not not be parsed by this case if the regexp
                               on the left was not there *)