diff --git a/baguette-sharp.opam b/baguette_sharp.opam similarity index 80% rename from baguette-sharp.opam rename to baguette_sharp.opam index 0b52215..252e5f5 100644 --- a/baguette-sharp.opam +++ b/baguette_sharp.opam @@ -1,20 +1,20 @@ # This file is generated by dune, edit dune-project instead opam-version: "2.0" -version: "2.0.3" +version: "2.0.4" synopsis: "The Baguette# Interpreter REPL" description: "The REPL for Baguette#" maintainer: ["Charlotte Thomas"] authors: ["Charlotte Thomas"] license: "MIT" homepage: "https://baguettesharp.fr" -doc: "https://baguettesharp.fr/doc" +doc: "https://github.com/coco33920/ocaml-baguettesharp-interpreter/wiki" bug-reports: "https://github.com/coco33920/ocaml-baguettesharp-interpreter/issues" depends: [ "dune" {>= "3.0"} - "ocaml" {>= "4.13.1"} - "fmt" {>= "0.7.0"} - "baguette_sharp" {>= "2.0.3"} + "ocaml" {>="4.13.1"} + "fmt" {>="0.7.0"} + "odoc" {with-doc} ] build: [ ["dune" "subst"] {dev} diff --git a/dune-project b/dune-project index 8a43730..b7c3f8e 100644 --- a/dune-project +++ b/dune-project @@ -1,6 +1,6 @@ (lang dune 3.0) -(name baguette-sharp) -(version 2.0.3) +(name baguette_sharp) +(version 2.0.4) (generate_opam_files false) (source @@ -14,7 +14,7 @@ (documentation https://github.com/coco33920/ocaml-baguettesharp-interpreter/wiki) (package - (name baguette-sharp) + (name baguette_sharp) (allow_empty) (homepage https://baguettesharp.fr) (synopsis "The Baguette# Interpreter REPL") diff --git a/opam.msg b/opam.msg index 3253394..1ae14f2 100644 --- a/opam.msg +++ b/opam.msg @@ -1,5 +1,4 @@ -Okay I *think* I get it now. I just can't get the library AND the executable to install at the -same time. So here is only the library. Primarly to see if I fixed all the issue and this ***should*** pass the -OPAM CI. -Thank you, +That's it! It includes both the repl (under baguette_sharp.repl) and the language itself! Thanks for the help I received :) +It *should* pass the CI this time. Hopefully. Yeah. +Thanks! Charlotte. \ No newline at end of file diff --git a/src/baguette_sharp.opam b/src/baguette_sharp.opam deleted file mode 100644 index e4b78a2..0000000 --- a/src/baguette_sharp.opam +++ /dev/null @@ -1,34 +0,0 @@ -# This file is generated by dune, edit dune-project instead -opam-version: "2.0" -version: "2.0.3" -synopsis: "The Baguette# Interpreter" -description: - "The Interpreter for Baguette#. Defines the lexer,parser the functions themselves and the Interpreter" -maintainer: ["Charlotte Thomas"] -authors: ["Charlotte Thomas"] -license: "MIT" -homepage: "https://baguettesharp.fr" -doc: "https://baguettesharp.fr/doc" -bug-reports: - "https://github.com/coco33920/ocaml-baguettesharp-interpreter/issues" -depends: [ - "dune" {>= "3.0"} - "ocaml" {>= "4.13.1"} - "fmt" {>= "0.7.0"} -] -build: [ - ["dune" "subst"] {dev} - [ - "dune" - "build" - "-p" - name - "-j" - jobs - "@install" - "@runtest" {with-test} - "@doc" {with-doc} - ] -] -dev-repo: - "git+https://github.com/coco33920/ocaml-baguettesharp-interpreter.git" diff --git a/src/dune b/src/dune index f6fe6c5..f7bba3d 100644 --- a/src/dune +++ b/src/dune @@ -3,4 +3,4 @@ (library (name baguette_sharp) (public_name baguette_sharp) - (libraries fmt str)) + (libraries fmt str)) \ No newline at end of file diff --git a/src/dune-project b/src/dune-project deleted file mode 100644 index 9017d53..0000000 --- a/src/dune-project +++ /dev/null @@ -1,23 +0,0 @@ -(lang dune 3.0) - -(name baguette_sharp) -(version 2.0.3) -(generate_opam_files false) - -(source - (github coco33920/ocaml-baguettesharp-interpreter)) - -(authors "Charlotte Thomas") - -(maintainers "Charlotte Thomas") - -(license MIT) - -(documentation https://github.com/coco33920/ocaml-baguettesharp-interpreter/wiki) - -(package - (name baguette_sharp) - (homepage https://baguettesharp.fr) - (synopsis "The Baguette# Interpreter") - (description "The Interpreter for Baguette#. Defines the lexer,parser the functions themselves and the Interpreter") - (depends ocaml>=4.13.1 dune>=3.0 fmt>=0.7.0)) diff --git a/src/interpreter.ml b/src/interpreter.ml index fc30d99..f1a3631 100644 --- a/src/interpreter.ml +++ b/src/interpreter.ml @@ -1,5 +1,4 @@ (**The Interpreter Module of B#*) - (**The Hashtbl storing the labels AST*) let labels = Hashtbl.create 100;; diff --git a/src/main/baguette_sharp_interpreter.ml b/src/main/baguette_sharp_interpreter.ml index ebefd8e..df57d34 100644 --- a/src/main/baguette_sharp_interpreter.ml +++ b/src/main/baguette_sharp_interpreter.ml @@ -1,6 +1,4 @@ (**The REPL of B#*) - - open Baguette_sharp (**List of all functions*) @@ -114,7 +112,7 @@ let _ = (list_of_funct,[ let usage_message = "baguette-sharp --input ";; let input_file = ref "";; -let print_about () = print_endline "Baguette# Version 2.0.3 by Charlotte THOMAS" +let print_about () = print_endline "Baguette# Version 2.0.4 by Charlotte THOMAS" let output_file = ref "";; let verbose = ref false;; let lexer = ref false;; diff --git a/src/main/dune b/src/main/dune index 93168b6..2a7528d 100644 --- a/src/main/dune +++ b/src/main/dune @@ -2,5 +2,5 @@ (executable (modes exe) (name baguette_sharp_interpreter) - (public_name baguette-sharp) - (libraries baguette_sharp fmt str linenoise)) + (public_name baguette_sharp.repl) + (libraries baguette_sharp fmt str linenoise)) \ No newline at end of file