Added 'sexplib'

Author: superbobry

_oasis

@@ -18,19 +18,22 @@ Flag strict
 Library llama_man
   Path:              lib_src
   CompiledObject:    best
-  Modules:           Types,
-                     Compiler
+  Modules:           Gcc_types,
+                     Gcc_compiler
   if flag(strict)
     NativeOpt:       -w @a -warn-error -a
     ByteOpt:         -w @a -warn-error -a
   BuildDepends:      core_kernel
+                     sexplib,
+                     sexplib.syntax,
 
 Executable gcc
   Path:              bin_src
-  MainIs:            main.ml  # rename?
+  MainIs:            gcc.ml
   CompiledObject:    best
   Install:           true
-  BuildDepends:      llama_man
+  BuildDepends:      llama_man,
+                     sexplib
 
 Executable test_runner
   Path:               lib_test
@@ -39,5 +42,5 @@ Executable test_runner
   Custom:             true
   CompiledObject:     best
   Install:            false
-  BuildDepends:       llama_man
-                    , oUnit (>= 2.0.0)
+  BuildDepends:       llama_man,
+                      oUnit (>= 2.0.0)

_tags

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 41650a373911173129593549eeaaf4b9)
+# DO NOT EDIT (digest: 625cb8920b31261e65753b003f41336e)
 # 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
@@ -19,18 +19,36 @@
 <lib_src/*.ml{,i}>: oasis_library_llama_man_byte
 <lib_src/llama_man.{cma,cmxa}>: oasis_library_llama_man_native
 <lib_src/*.ml{,i}>: oasis_library_llama_man_native
-<lib_src/*.ml{,i}>: package(core_kernel)
+<lib_src/*.ml{,i}>: package()
+<lib_src/*.ml{,i}>: package(core_kernel
+sexplib)
+<lib_src/*.ml{,i}>: package(sexplib.syntax)
 # Executable gcc
-<bin_src/main.{native,byte}>: package(core_kernel)
-<bin_src/main.{native,byte}>: use_llama_man
-<bin_src/*.ml{,i}>: package(core_kernel)
+<bin_src/gcc.{native,byte}>: package()
+<bin_src/gcc.{native,byte}>: package(core_kernel
+sexplib)
+<bin_src/gcc.{native,byte}>: package(sexplib)
+<bin_src/gcc.{native,byte}>: package(sexplib.syntax)
+<bin_src/gcc.{native,byte}>: use_llama_man
+<bin_src/*.ml{,i}>: package()
+<bin_src/*.ml{,i}>: package(core_kernel
+sexplib)
+<bin_src/*.ml{,i}>: package(sexplib)
+<bin_src/*.ml{,i}>: package(sexplib.syntax)
 <bin_src/*.ml{,i}>: use_llama_man
 # Executable test_runner
-<lib_test/test_runner.{native,byte}>: package(core_kernel)
+<lib_test/test_runner.{native,byte}>: package()
+<lib_test/test_runner.{native,byte}>: package(core_kernel
+sexplib)
 <lib_test/test_runner.{native,byte}>: package(oUnit)
+<lib_test/test_runner.{native,byte}>: package(sexplib.syntax)
 <lib_test/test_runner.{native,byte}>: use_llama_man
-<lib_test/*.ml{,i}>: package(core_kernel)
+<lib_test/*.ml{,i}>: package()
+<lib_test/*.ml{,i}>: package(core_kernel
+sexplib)
 <lib_test/*.ml{,i}>: package(oUnit)
+<lib_test/*.ml{,i}>: package(sexplib.syntax)
 <lib_test/*.ml{,i}>: use_llama_man
 <lib_test/test_runner.{native,byte}>: custom
 # OASIS_STOP
+<lib_src/*.ml{,i}>: syntax_camlp4o

bin_src/gcc.ml

@@ -0,0 +1,9 @@
+open Sexplib
+
+open Gcc_types
+
+let () =
+  let sexp = Sexp.input_sexp stdin in
+  let expr = expr_of_sexp sexp in
+  let open Gcc_compiler in
+  compile expr |> assemble |> print_endline

bin_src/main.ml

@@ -1,8 +1,8 @@
 # OASIS_START
-# DO NOT EDIT (digest: 77f81335e4d057100d68e2545a139853)
+# DO NOT EDIT (digest: 303cc0010832e896a89c08342b8777ac)
 version = "2014"
 description = "ICFPC"
-requires = "core_kernel"
+requires = "core_kernel sexplib sexplib.syntax "
 archive(byte) = "llama_man.cma"
 archive(byte, plugin) = "llama_man.cma"
 archive(native) = "llama_man.cmxa"

lib_src/META

@@ -1,8 +1,8 @@
 open Core_kernel.Std
 
-open Types
+open Gcc_types
 
-type code = Types.instruction list
+type code = instruction list
 
 type env = {
   vars   : var list;

lib_src/compiler.mli

@@ -39,7 +39,7 @@ let is_phony = function
   | LABEL _ | COMMENT _ -> true
   | _ -> false
 
-type var = string
+type var = string with sexp
 
 type expr =
   | Const of int
@@ -57,4 +57,4 @@ type expr =
   | Var of var
   | Car of expr
   | Cdr of expr
-  (* | Call of expr * expr list *)
+with sexp

lib_src/compiler.ml renamed to lib_src/gcc_compiler.ml

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 024da795f60335c7b36cece02d6f3960)
-Types
-Compiler
+# DO NOT EDIT (digest: 0392e096655bdc580a7d9762ef730087)
+Gcc_types
+Gcc_compiler
 # OASIS_STOP

lib_src/types.ml renamed to lib_src/gcc_types.ml

@@ -1,5 +1,5 @@
 # OASIS_START
-# DO NOT EDIT (digest: 024da795f60335c7b36cece02d6f3960)
-Types
-Compiler
+# DO NOT EDIT (digest: 0392e096655bdc580a7d9762ef730087)
+Gcc_types
+Gcc_compiler
 # OASIS_STOP

lib_src/llama_man.mldylib

@@ -2,12 +2,13 @@ open Core_kernel.Std
 
 open OUnit2
 
-open Types
-open Compiler
-open Stdlib
+open Gcc_types
+
+let scope name var expr = Call (Fn ([name], expr), [var])
 
 
 let test_gcc ~ast ~path =
+  let open Gcc_compiler in
   let asm      = compile ast |> assemble
   and expected = In_channel.read_all path
   in assert_equal ~printer:(sprintf "%S") expected asm

lib_src/llama_man.mllib

@@ -1,7 +1,7 @@
 (* setup.ml generated for the first time by OASIS v0.4.4 *)
 
 (* OASIS_START *)
-(* DO NOT EDIT (digest: 22f9ded569f2014f1cc40a7e4cb20150) *)
+(* DO NOT EDIT (digest: c77a54a4395ba4ba8bb9b4f87a7f95ab) *)
 (*
    Regenerated by OASIS v0.4.4
    Visit http://oasis.forge.ocamlcore.org for more information and
@@ -6718,7 +6718,11 @@ let setup_t =
                       bs_path = "lib_src";
                       bs_compiled_object = Best;
                       bs_build_depends =
-                        [FindlibPackage ("core_kernel", None)];
+                        [
+                           FindlibPackage ("core_kernel\nsexplib", None);
+                           FindlibPackage ("sexplib.syntax", None);
+                           FindlibPackage ("", None)
+                        ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
                       bs_data_files = [];
@@ -6740,7 +6744,7 @@ let setup_t =
                         ]
                    },
                    {
-                      lib_modules = ["Types"; "Compiler"];
+                      lib_modules = ["Gcc_types"; "Gcc_compiler"];
                       lib_pack = false;
                       lib_internal_modules = [];
                       lib_findlib_parent = None;
@@ -6758,7 +6762,11 @@ let setup_t =
                       bs_install = [(OASISExpr.EBool true, true)];
                       bs_path = "bin_src";
                       bs_compiled_object = Best;
-                      bs_build_depends = [InternalLibrary "llama_man"];
+                      bs_build_depends =
+                        [
+                           InternalLibrary "llama_man";
+                           FindlibPackage ("sexplib", None)
+                        ];
                       bs_build_tools = [ExternalTool "ocamlbuild"];
                       bs_c_sources = [];
                       bs_data_files = [];
@@ -6769,7 +6777,7 @@ let setup_t =
                       bs_byteopt = [(OASISExpr.EBool true, [])];
                       bs_nativeopt = [(OASISExpr.EBool true, [])]
                    },
-                   {exec_custom = false; exec_main_is = "main.ml"});
+                   {exec_custom = false; exec_main_is = "gcc.ml"});
                Executable
                  ({
                      cs_name = "test_runner";
@@ -6812,14 +6820,14 @@ let setup_t =
        };
      oasis_fn = Some "_oasis";
      oasis_version = "0.4.4";
-     oasis_digest = Some "c\bb® ìBâ6Ô\023\028\140}èX";
+     oasis_digest = Some "­¼&¥²\006òW\142\015HùC¾i{";
      oasis_exec = None;
      oasis_setup_args = [];
      setup_update = false
   };;
 
 let setup () = BaseSetup.setup setup_t;;
 
-# 6824 "setup.ml"
+# 6832 "setup.ml"
 (* OASIS_STOP *)
 let () = setup ();;