summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/compiler.sig2
-rw-r--r--src/compiler.sml2
-rw-r--r--src/elaborate.sig2
-rw-r--r--src/elaborate.sml2
-rw-r--r--src/lacweb.grm2
-rw-r--r--src/source.sml (renamed from src/laconic.sml)2
-rw-r--r--src/source_print.sig (renamed from src/laconic_print.sig)12
-rw-r--r--src/source_print.sml (renamed from src/laconic_print.sml)4
-rw-r--r--src/sources6
9 files changed, 17 insertions, 17 deletions
diff --git a/src/compiler.sig b/src/compiler.sig
index 92c4d679..ede5d8b5 100644
--- a/src/compiler.sig
+++ b/src/compiler.sig
@@ -29,7 +29,7 @@
signature COMPILER = sig
- val parse : string -> Laconic.file option
+ val parse : string -> Source.file option
val testParse : string -> unit
diff --git a/src/compiler.sml b/src/compiler.sml
index 2463528b..967fcf3d 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -58,7 +58,7 @@ fun testParse filename =
if ErrorMsg.anyErrors () then
print "Recoverable parse error\n"
else
- (Print.print (LaconicPrint.p_file file);
+ (Print.print (SourcePrint.p_file file);
print "\n")
end
diff --git a/src/elaborate.sig b/src/elaborate.sig
index 99fc9ebf..519e5689 100644
--- a/src/elaborate.sig
+++ b/src/elaborate.sig
@@ -27,6 +27,6 @@
signature ELABORATE = sig
- val elabFile : Laconic.file -> Elab.file
+ val elabFile : Source.file -> Elab.file
end
diff --git a/src/elaborate.sml b/src/elaborate.sml
index e6044e49..ed290d55 100644
--- a/src/elaborate.sml
+++ b/src/elaborate.sml
@@ -27,7 +27,7 @@
structure Elaborate :> ELABORATE = struct
-structure L = Laconic
+structure L = Source
structure L' = Elab
structure E = ElabEnv
structure U = ElabUtil
diff --git a/src/lacweb.grm b/src/lacweb.grm
index 2f9150fa..a6054494 100644
--- a/src/lacweb.grm
+++ b/src/lacweb.grm
@@ -27,7 +27,7 @@
(* Grammar for Laconic/Web programs *)
-open Laconic
+open Source
val s = ErrorMsg.spanOf
diff --git a/src/laconic.sml b/src/source.sml
index 02770a75..c42e8bab 100644
--- a/src/laconic.sml
+++ b/src/source.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-structure Laconic = struct
+structure Source = struct
type 'a located = 'a ErrorMsg.located
diff --git a/src/laconic_print.sig b/src/source_print.sig
index 079b420e..c21d328a 100644
--- a/src/laconic_print.sig
+++ b/src/source_print.sig
@@ -27,10 +27,10 @@
(* Pretty-printing Laconic/Web *)
-signature LACONIC_PRINT = sig
- val p_kind : Laconic.kind Print.printer
- val p_explicitness : Laconic.explicitness Print.printer
- val p_con : Laconic.con Print.printer
- val p_decl : Laconic.decl Print.printer
- val p_file : Laconic.file Print.printer
+signature SOURCE_PRINT = sig
+ val p_kind : Source.kind Print.printer
+ val p_explicitness : Source.explicitness Print.printer
+ val p_con : Source.con Print.printer
+ val p_decl : Source.decl Print.printer
+ val p_file : Source.file Print.printer
end
diff --git a/src/laconic_print.sml b/src/source_print.sml
index 9b18dcba..704d07ec 100644
--- a/src/laconic_print.sml
+++ b/src/source_print.sml
@@ -27,12 +27,12 @@
(* Pretty-printing Laconic/Web *)
-structure LaconicPrint :> LACONIC_PRINT = struct
+structure SourcePrint :> SOURCE_PRINT = struct
open Print.PD
open Print
-open Laconic
+open Source
fun p_kind' par (k, _) =
case k of
diff --git a/src/sources b/src/sources
index e82c0c7e..9c879139 100644
--- a/src/sources
+++ b/src/sources
@@ -1,7 +1,7 @@
errormsg.sig
errormsg.sml
-laconic.sml
+source.sml
lacweb.grm
lacweb.lex
@@ -9,8 +9,8 @@ lacweb.lex
print.sig
print.sml
-laconic_print.sig
-laconic_print.sml
+source_print.sig
+source_print.sml
elab.sml