summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/c/driver.c2
-rw-r--r--src/cjr_print.sig2
-rw-r--r--src/cjr_print.sml2
-rw-r--r--src/compiler.sig6
-rw-r--r--src/compiler.sml40
-rw-r--r--src/core_print.sig2
-rw-r--r--src/core_print.sml2
-rw-r--r--src/elab_print.sig2
-rw-r--r--src/elab_print.sml2
-rw-r--r--src/expl_print.sml2
-rw-r--r--src/mono_print.sig2
-rw-r--r--src/mono_print.sml2
-rw-r--r--src/print.sml2
-rw-r--r--src/source_print.sig2
-rw-r--r--src/source_print.sml2
-rw-r--r--src/sources4
-rw-r--r--src/urweb.grm (renamed from src/lacweb.grm)6
-rw-r--r--src/urweb.lex (renamed from src/lacweb.lex)4
18 files changed, 43 insertions, 43 deletions
diff --git a/src/c/driver.c b/src/c/driver.c
index 21001d0c..5300371d 100644
--- a/src/c/driver.c
+++ b/src/c/driver.c
@@ -7,7 +7,7 @@
#include <pthread.h>
-#include "lacweb.h"
+#include "urweb.h"
int lw_port = 8080;
int lw_backlog = 10;
diff --git a/src/cjr_print.sig b/src/cjr_print.sig
index 2c860550..f8ffa193 100644
--- a/src/cjr_print.sig
+++ b/src/cjr_print.sig
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web C jr. language *)
+(* Pretty-printing Ur/Web C jr. language *)
signature CJR_PRINT = sig
val p_typ : CjrEnv.env -> Cjr.typ Print.printer
diff --git a/src/cjr_print.sml b/src/cjr_print.sml
index 227abf2e..115f09fc 100644
--- a/src/cjr_print.sml
+++ b/src/cjr_print.sml
@@ -1145,7 +1145,7 @@ fun p_file env (ds, ps) =
string "#include <stdlib.h>",
newline,
newline,
- string "#include \"lacweb.h\"",
+ string "#include \"urweb.h\"",
newline,
newline,
p_list_sep newline (fn x => x) pds,
diff --git a/src/compiler.sig b/src/compiler.sig
index 2594a0c7..51ec0537 100644
--- a/src/compiler.sig
+++ b/src/compiler.sig
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Laconic/Web main compiler interface *)
+(* Ur/Web main compiler interface *)
signature COMPILER = sig
@@ -44,8 +44,8 @@ signature COMPILER = sig
val time : ('src, 'dst) transform -> 'src -> unit
val timePrint : ('src, 'dst) transform -> 'src -> unit
- val parseLac : (string, Source.file) phase
- val parseLig : (string, Source.sgn_item list) phase
+ val parseUr : (string, Source.file) phase
+ val parseUrs : (string, Source.sgn_item list) phase
val parse : (job, Source.file) phase
val elaborate : (Source.file, Elab.file) phase
diff --git a/src/compiler.sml b/src/compiler.sml
index 6ea393a6..4df71bcd 100644
--- a/src/compiler.sml
+++ b/src/compiler.sml
@@ -25,13 +25,13 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Laconic/Web language parser *)
+(* Ur/Web language parser *)
structure Compiler :> COMPILER = struct
-structure LacwebLrVals = LacwebLrValsFn(structure Token = LrParser.Token)
-structure Lex = LacwebLexFn(structure Tokens = LacwebLrVals.Tokens)
-structure LacwebP = Join(structure ParserData = LacwebLrVals.ParserData
+structure UrwebLrVals = UrwebLrValsFn(structure Token = LrParser.Token)
+structure Lex = UrwebLexFn(structure Tokens = UrwebLrVals.Tokens)
+structure UrwebP = Join(structure ParserData = UrwebLrVals.ParserData
structure Lex = Lex
structure LrParser = LrParser)
@@ -123,7 +123,7 @@ fun timePrint (tr : ('src, 'dst) transform) input =
print "\n")
end
-val parseLig =
+val parseUrs =
{func = fn filename => let
val fname = OS.FileSys.tmpName ()
val outf = TextIO.openOut fname
@@ -145,7 +145,7 @@ val parseLig =
fun get _ = TextIO.input file
fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
- val (absyn, _) = LacwebP.parse (30, lexer, parseerror, ())
+ val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
in
TextIO.closeIn file;
case absyn of
@@ -161,7 +161,7 @@ val parseLig =
print = Print.p_list_sep Print.PD.newline SourcePrint.p_sgn_item}
(* The main parsing routine *)
-val parseLac = {
+val parseUr = {
func = fn filename =>
let
val () = (ErrorMsg.resetErrors ();
@@ -171,7 +171,7 @@ val parseLac = {
fun get _ = TextIO.input file
fun parseerror (s, p1, p2) = ErrorMsg.errorAt' (p1, p2) s
val lexer = LrParser.Stream.streamify (Lex.makeLexer get)
- val (absyn, _) = LacwebP.parse (30, lexer, parseerror, ())
+ val (absyn, _) = UrwebP.parse (30, lexer, parseerror, ())
in
TextIO.closeIn file;
case absyn of
@@ -198,23 +198,23 @@ val parse = {
fun parseOne fname =
let
val mname = nameOf fname
- val lac = OS.Path.joinBaseExt {base = fname, ext = SOME "lac"}
- val lig = OS.Path.joinBaseExt {base = fname, ext = SOME "lig"}
+ val ur = OS.Path.joinBaseExt {base = fname, ext = SOME "ur"}
+ val urs = OS.Path.joinBaseExt {base = fname, ext = SOME "urs"}
val sgnO =
- if Posix.FileSys.access (lig, []) then
- SOME (Source.SgnConst (#func parseLig lig),
- {file = lig,
+ if Posix.FileSys.access (urs, []) then
+ SOME (Source.SgnConst (#func parseUrs urs),
+ {file = urs,
first = ErrorMsg.dummyPos,
last = ErrorMsg.dummyPos})
else
NONE
- val loc = {file = lac,
+ val loc = {file = ur,
first = ErrorMsg.dummyPos,
last = ErrorMsg.dummyPos}
- val ds = #func parseLac lac
+ val ds = #func parseUr ur
in
(Source.DStr (mname, sgnO, (Source.StrConst ds, loc)), loc)
end
@@ -234,7 +234,7 @@ val toParse = transform parse "parse"
val elaborate = {
func = fn file => let
- val basis = #func parseLig "lib/basis.lig"
+ val basis = #func parseUrs "lib/basis.urs"
in
Elaborate.elabFile basis ElabEnv.empty file
end,
@@ -334,7 +334,7 @@ val toCjrize = toMono_opt2 o transform cjrize "cjrize"
fun compileC {cname, oname, ename} =
let
val compile = "gcc -O3 -I include -c " ^ cname ^ " -o " ^ oname
- val link = "gcc -pthread -O3 clib/lacweb.o " ^ oname ^ " clib/driver.o -o " ^ ename
+ val link = "gcc -pthread -O3 clib/urweb.o " ^ oname ^ " clib/driver.o -o " ^ ename
in
if not (OS.Process.isSuccess (OS.Process.system compile)) then
print "C compilation failed\n"
@@ -346,11 +346,11 @@ fun compileC {cname, oname, ename} =
fun compile job =
case run toCjrize job of
- NONE => print "Laconic compilation failed\n"
+ NONE => print "Ur compilation failed\n"
| SOME file =>
let
- val cname = "/tmp/lacweb.c"
- val oname = "/tmp/lacweb.o"
+ val cname = "/tmp/urweb.c"
+ val oname = "/tmp/urweb.o"
val ename = "/tmp/webapp"
val outf = TextIO.openOut cname
diff --git a/src/core_print.sig b/src/core_print.sig
index dfad5827..38a51aef 100644
--- a/src/core_print.sig
+++ b/src/core_print.sig
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web internal language *)
+(* Pretty-printing Ur/Web internal language *)
signature CORE_PRINT = sig
val p_kind : Core.kind Print.printer
diff --git a/src/core_print.sml b/src/core_print.sml
index 66432866..b03b25f6 100644
--- a/src/core_print.sml
+++ b/src/core_print.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing core Laconic/Web *)
+(* Pretty-printing core Ur/Web *)
structure CorePrint :> CORE_PRINT = struct
diff --git a/src/elab_print.sig b/src/elab_print.sig
index ead61e68..3d078576 100644
--- a/src/elab_print.sig
+++ b/src/elab_print.sig
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web *)
+(* Pretty-printing Ur/Web *)
signature ELAB_PRINT = sig
val p_kind : Elab.kind Print.printer
diff --git a/src/elab_print.sml b/src/elab_print.sml
index 337b1d8a..a0589b7d 100644
--- a/src/elab_print.sml
+++ b/src/elab_print.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing elaborated Laconic/Web *)
+(* Pretty-printing elaborated Ur/Web *)
structure ElabPrint :> ELAB_PRINT = struct
diff --git a/src/expl_print.sml b/src/expl_print.sml
index f854c03d..ded90ada 100644
--- a/src/expl_print.sml
+++ b/src/expl_print.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing elaborated Laconic/Web *)
+(* Pretty-printing elaborated Ur/Web *)
structure ExplPrint :> EXPL_PRINT = struct
diff --git a/src/mono_print.sig b/src/mono_print.sig
index 6f7f09a9..405ff416 100644
--- a/src/mono_print.sig
+++ b/src/mono_print.sig
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web monomorphic language *)
+(* Pretty-printing Ur/Web monomorphic language *)
signature MONO_PRINT = sig
val p_typ : MonoEnv.env -> Mono.typ Print.printer
diff --git a/src/mono_print.sml b/src/mono_print.sml
index afa86c18..7acb05b5 100644
--- a/src/mono_print.sml
+++ b/src/mono_print.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing monomorphic Laconic/Web *)
+(* Pretty-printing monomorphic Ur/Web *)
structure MonoPrint :> MONO_PRINT = struct
diff --git a/src/print.sml b/src/print.sml
index db6af55c..3917a998 100644
--- a/src/print.sml
+++ b/src/print.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web *)
+(* Generic printing support code *)
structure Print :> PRINT = struct
diff --git a/src/source_print.sig b/src/source_print.sig
index 2128aa3f..be68cdd4 100644
--- a/src/source_print.sig
+++ b/src/source_print.sig
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web *)
+(* Pretty-printing Ur/Web *)
signature SOURCE_PRINT = sig
val p_kind : Source.kind Print.printer
diff --git a/src/source_print.sml b/src/source_print.sml
index 7ae2b23e..f98227ec 100644
--- a/src/source_print.sml
+++ b/src/source_print.sml
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Pretty-printing Laconic/Web *)
+(* Pretty-printing Ur/Web *)
structure SourcePrint :> SOURCE_PRINT = struct
diff --git a/src/sources b/src/sources
index 94c37050..c57a30b1 100644
--- a/src/sources
+++ b/src/sources
@@ -18,8 +18,8 @@ prim.sml
source.sml
-lacweb.grm
-lacweb.lex
+urweb.grm
+urweb.lex
source_print.sig
source_print.sml
diff --git a/src/lacweb.grm b/src/urweb.grm
index feff82df..aa062516 100644
--- a/src/lacweb.grm
+++ b/src/urweb.grm
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Grammar for Laconic/Web programs *)
+(* Grammar for Ur/Web programs *)
open Source
@@ -142,7 +142,7 @@ fun sql_relop (oper, sqlexp1, sqlexp2, loc) =
end
%%
-%header (functor LacwebLrValsFn(structure Token : TOKEN))
+%header (functor UrwebLrValsFn(structure Token : TOKEN))
%term
EOF
@@ -275,7 +275,7 @@ fun sql_relop (oper, sqlexp1, sqlexp2, loc) =
%eop EOF
%noshift EOF
-%name Lacweb
+%name Urweb
%right SEMI
%nonassoc LARROW
diff --git a/src/lacweb.lex b/src/urweb.lex
index e593c5fe..1d64a85c 100644
--- a/src/lacweb.lex
+++ b/src/urweb.lex
@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*)
-(* Lexing info for Laconic/Web programs *)
+(* Lexing info for Ur/Web programs *)
type pos = int
type svalue = Tokens.svalue
@@ -107,7 +107,7 @@ fun initialize () = (xmlTag := [];
%%
-%header (functor LacwebLexFn(structure Tokens : Lacweb_TOKENS));
+%header (functor UrwebLexFn(structure Tokens : Urweb_TOKENS));
%full
%s COMMENT STRING XML XMLTAG;
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-31 10:29:25 +0000