Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dune-tree'
Browse files Browse the repository at this point in the history
  • Loading branch information
vanilla-extracts committed Mar 15, 2022
2 parents 47a3967 + 23f84ed commit 9574f48
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 76 deletions.
10 changes: 5 additions & 5 deletions baguette-sharp.opam → baguette_sharp.opam
Original file line number Diff line number Diff line change
@@ -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}
Expand Down
6 changes: 3 additions & 3 deletions dune-project
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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")
Expand Down
7 changes: 3 additions & 4 deletions opam.msg
Original file line number Diff line number Diff line change
@@ -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.
34 changes: 0 additions & 34 deletions src/baguette_sharp.opam

This file was deleted.

2 changes: 1 addition & 1 deletion src/dune
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@
(library
(name baguette_sharp)
(public_name baguette_sharp)
(libraries fmt str))
(libraries fmt str))
23 changes: 0 additions & 23 deletions src/dune-project

This file was deleted.

1 change: 0 additions & 1 deletion src/interpreter.ml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
(**The Interpreter Module of B#*)


(**The Hashtbl storing the labels AST*)
let labels = Hashtbl.create 100;;
Expand Down
4 changes: 1 addition & 3 deletions src/main/baguette_sharp_interpreter.ml
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
(**The REPL of B#*)


open Baguette_sharp

(**List of all functions*)
Expand Down Expand Up @@ -114,7 +112,7 @@ let _ = (list_of_funct,[

let usage_message = "baguette-sharp --input <filename>";;
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;;
Expand Down
4 changes: 2 additions & 2 deletions src/main/dune
Original file line number Diff line number Diff line change
Expand Up @@ -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))

0 comments on commit 9574f48

Please sign in to comment.