[MOREL-7] Rename project from 'smlj' to 'morel'

HISTORY.md

@@ -18,12 +18,12 @@ language governing permissions and limitations under the
 License.
 {% endcomment %}
 -->
-# smlj release history and change log
+# Morel release history and change log
 
 For a full list of releases, see
-<a href="https://github.com/julianhyde/smlj/releases">github</a>.
+<a href="https://github.com/julianhyde/morel/releases">github</a>.
 
-## <a href="https://github.com/julianhyde/smlj/releases/tag/smlj-0.1">0.1</a> / 2019-07-24
+## <a href="https://github.com/julianhyde/morel/releases/tag/smlj-0.1">0.1</a> / 2019-07-24
 
 Initial release features the core language (primitive types, lists,
 tuples, records; `let`, `if`, `fn` and `case` expressions; `val`,

HOWTO.md

@@ -18,7 +18,7 @@ language governing permissions and limitations under the
 License.
 {% endcomment %}
 -->
-# smlj HOWTO
+# Morel HOWTO
 
 ## How to make a release (for committers)
 
@@ -57,18 +57,18 @@ mvn -Prelease -DskipTests release:perform
 Stage the release:
 * Go to https://oss.sonatype.org and log in.
 * Under "Build Promotion", click on "Staging Repositories".
-* Select the line "smlj-nnnn", and click "Close". You might need to
+* Select the line "morel-nnnn", and click "Close". You might need to
   click "Refresh" a couple of times before it closes.
 
 After testing, publish the release:
 * Go to https://oss.sonatype.org and log in.
 * Under "Build Promotion", click on "Staging Repositories".
-* Select the line "smlj-nnnn", and click "Release".
+* Select the line "morel-nnnn", and click "Release".
 
 Wait a couple of hours for the artifacts to appear on Maven central,
 and announce the release.
 
-Update the [github release list](https://github.com/julianhyde/smlj/releases).
+Update the [github release list](https://github.com/julianhyde/morel/releases).
 
 ## Cleaning up after a failed release attempt (for committers)
 
@@ -78,8 +78,8 @@ Update the [github release list](https://github.com/julianhyde/smlj/releases).
 git tag
 
 # If the tag exists, delete it locally and remotely
-git tag -d smlj-X.Y.Z
-git push origin :refs/tags/smlj-X.Y.Z
+git tag -d morel-X.Y.Z
+git push origin :refs/tags/morel-X.Y.Z
 
 # Remove modified files
 mvn release:clean

NOTICE

@@ -1,5 +1,5 @@
-smlj
-Standard ML interpreter, implemented in Java
+morel
+Standard ML interpreter, with relational extensions, implemented in Java
 
 Copyright (C) 2019-2019 Julian Hyde
 All Rights Reserved.

README

@@ -1,6 +1,6 @@
-smlj release 0.1.0
+Morel release 0.1.0
 
-This is a source or binary distribution of smlj.
+This is a source or binary distribution of Morel.
 
 Changes since the previous release are described in the
 HISTORY.md file.
@@ -10,5 +10,5 @@ The LICENSE and NOTICE files contain license information.
 If this is a source distribution, you can find instructions how to
 build the release in the "Building" section in README.md.
 
-Further information about smlj is available at its web site,
-https://github.com/julianhyde/smlj.
+Further information about Morel is available at its web site,
+https://github.com/julianhyde/morel.

README.md

@@ -18,18 +18,20 @@ language governing permissions and limitations under the
 License.
 {% endcomment %}
 -->
-# smlj
-Standard ML interpreter, implemented in Java
+# Morel
+Standard ML interpreter, with relational extensions, implemented in Java
+
+(Until version 0.1, Morel was known as smlj.)
 
 ## Requirements
 
 Java version 8 or higher.
 
-## Get smlj
+## Get Morel
 
 ### From Maven
 
-Get smlj from
+Get Morel from
 <a href="https://search.maven.org/#search%7Cga%7C1%7Cg%3Anet.hydromatic%20a%3Asmlj">Maven Central</a>:
 
 ```xml
@@ -43,8 +45,8 @@ Get smlj from
 ### Download and build
 
 ```bash
-$ git clone git://github.com/julianhyde/smlj.git
-$ cd smlj
+$ git clone git://github.com/julianhyde/morel.git
+$ cd morel
 $ ./mvnw install
 ```
 
@@ -57,8 +59,8 @@ On Windows, the last line is
 ### Run the shell
 
 ```bash
-$ ./smlj
-smlj version 0.1.0 (java version "11.0.4", JLine terminal, xterm-256color)
+$ ./morel
+morel version 0.1.0 (java version "11.0.4", JLine terminal, xterm-256color)
 = "Hello, world!";
 val it = "Hello, world!" : string
 = exit
@@ -215,12 +217,12 @@ the sub-query returns, just whether it returns any rows).
 
 * License: <a href="LICENSE">Apache License, Version 2.0</a>
 * Author: Julian Hyde (<a href="https://twitter.com/julianhyde">@julianhyde</a>)
-* Project page: https://www.hydromatic.net/smlj
-* API: https://www.hydromatic.net/smlj/apidocs
-* Source code: https://github.com/julianhyde/smlj
+* Project page: https://www.hydromatic.net/morel
+* API: https://www.hydromatic.net/morel/apidocs
+* Source code: https://github.com/julianhyde/morel
 * Developers list:
   <a href="mailto:[email protected]">dev at calcite.apache.org</a>
   (<a href="https://mail-archives.apache.org/mod_mbox/calcite-dev/">archive</a>,
   <a href="mailto:[email protected]">subscribe</a>)
-* Issues: https://github.com/julianhyde/smlj/issues
+* Issues: https://github.com/julianhyde/morel/issues
 * <a href="HISTORY.md">Release notes and history</a>

cast/build.sh

@@ -2,10 +2,10 @@
 #
 # Generates an asciinema screencast from a script.
 # You must install asciinema first; try 'brew install asciinema'.
-# Note that this script destroys ~/smlj.
+# Note that this script destroys ~/morel.
 # Use terminal of height 16, width 72.
 # Usage:
-#   build.sh ~/dev/smlj/cast/smlj-0.1.0.txt
+#   build.sh ~/dev/morel/cast/morel-0.1.0.txt
 DIR=$(cd $(dirname $0); pwd)
 INFILE="$1"
 OUTFILE=$(dirname "${INFILE}")/$(basename "${INFILE}" .txt).cast
@@ -17,7 +17,7 @@ cat ${INFILE} |
     ${DIR}/play.sh |
     (
         cd ~
-        rm -rf ~/smlj
-        asciinema rec -t"smlj 0.1.0" --stdin --overwrite "${OUTFILE}"
+        rm -rf ~/morel
+        asciinema rec -t"morel 0.1.0" --stdin --overwrite "${OUTFILE}"
     )
 # End build.sh

cast/post.awk

@@ -23,7 +23,7 @@ function changeTime(t, arg) {
   delta = t - tPrev
 
   cutDeltaPrev = cutDelta
-  if (FILENAME ~ "/smlj-0.1.0.cast") {
+  if (FILENAME ~ "/morel-0.1.0.cast") {
     cut(t, 80.6, 87.2)
   }
 
@@ -68,7 +68,7 @@ BEGIN {
     verb = matches[2]
     arg = matches[3]
     changeTime(t, arg)
-    if (FILENAME ~ "/smlj-0.1.0.cast") {
+    if (FILENAME ~ "/morel-0.1.0.cast") {
       if (index(arg, "SLF4J:") > 0) {
         next
       }

smlj → morel

@@ -1,5 +1,5 @@
 #!/bin/bash
-# Script to launch smlj
+# Script to launch morel
 #
 # Licensed to Julian Hyde under one or more contributor license
 # agreements.  See the NOTICE file distributed with this work
@@ -19,9 +19,9 @@
 # License.
 #
 # Example:
-# $ ./smlj
-# smlj> 3 + 5;
-# smlj> it = 8;
+# $ ./morel
+# morel> 3 + 5;
+# morel> it = 8;
 
 # Deduce whether we are running cygwin
 case $(uname -s) in
@@ -51,6 +51,6 @@ fi
 
 export JAVA_OPTS=-Djavax.xml.parsers.DocumentBuilderFactory=com.sun.org.apache.xerces.internal.jaxp.DocumentBuilderFactoryImpl
 
-exec java $VM_OPTS -cp "${CP}" $JAVA_OPTS net.hydromatic.sml.Shell --foreign='net.hydromatic.sml.DataSet$Dictionary' "$@"
+exec java $VM_OPTS -cp "${CP}" $JAVA_OPTS net.hydromatic.morel.Shell --foreign='net.hydromatic.morel.DataSet$Dictionary' "$@"
 
-# End smlj
+# End morel

pom.xml

@@ -26,13 +26,13 @@ License.
     <version>0.1</version>
   </parent>
 
-  <artifactId>smlj</artifactId>
+  <artifactId>morel</artifactId>
   <version>0.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
 
-  <name>smlj</name>
-  <description>Standard ML interpreter, implemented in Java</description>
-  <url>https://github.com/julianhyde/smlj</url>
+  <name>morel</name>
+  <description>Standard ML interpreter, with relational extensions, implemented in Java</description>
+  <url>https://github.com/julianhyde/morel</url>
   <inceptionYear>2019</inceptionYear>
   <organization>
     <name>Julian Hyde</name>
@@ -100,28 +100,28 @@ License.
     <slf4j.version>1.7.25</slf4j.version>
 
     <maven-javadoc-plugin.additionalOptions>-html5</maven-javadoc-plugin.additionalOptions>
-    <maven-javadoc-plugin.excludePackageNames>net.hydromatic.sml.parse</maven-javadoc-plugin.excludePackageNames>
+    <maven-javadoc-plugin.excludePackageNames>net.hydromatic.morel.parse</maven-javadoc-plugin.excludePackageNames>
     <maven-javadoc-plugin.link>https://docs.oracle.com/javase/9/docs/api/</maven-javadoc-plugin.link>
   </properties>
 
   <!-- Environment settings. -->
   <distributionManagement>
     <site>
-      <id>smlj.website</id>
-      <name>smlj web site</name>
-      <url>file:/home/jhyde/web2/smlj</url>
+      <id>morel.website</id>
+      <name>morel web site</name>
+      <url>file:/home/jhyde/web2/morel</url>
     </site>
   </distributionManagement>
 
   <issueManagement>
     <system>github</system>
-    <url>https://github.com/julianhyde/smlj/issues</url>
+    <url>https://github.com/julianhyde/morel/issues</url>
   </issueManagement>
 
   <scm>
-    <connection>scm:git:git://github.com/julianhyde/smlj.git</connection>
-    <developerConnection>scm:git:[email protected]:julianhyde/smlj.git</developerConnection>
-    <url>scm:git:git://github.com/julianhyde/smlj.git</url>
+    <connection>scm:git:git://github.com/julianhyde/morel.git</connection>
+    <developerConnection>scm:git:[email protected]:julianhyde/morel.git</developerConnection>
+    <url>scm:git:git://github.com/julianhyde/morel.git</url>
     <tag>HEAD</tag>
   </scm>
 
@@ -366,7 +366,7 @@ License.
             </goals>
             <configuration>
               <includes>
-                <include>**/SmlParser.jj</include>
+                <include>**/MorelParser.jj</include>
               </includes>
               <lookAhead>1</lookAhead>
               <isStatic>false</isStatic>

src/main/java/net/hydromatic/sml/Main.java → src/main/java/net/hydromatic/morel/Main.java

@@ -16,19 +16,19 @@
  * language governing permissions and limitations under the
  * License.
  */
-package net.hydromatic.sml;
+package net.hydromatic.morel;
 
 import com.google.common.collect.ImmutableMap;
 
-import net.hydromatic.sml.ast.AstNode;
-import net.hydromatic.sml.compile.CompiledStatement;
-import net.hydromatic.sml.compile.Compiles;
-import net.hydromatic.sml.compile.Environment;
-import net.hydromatic.sml.foreign.ForeignValue;
-import net.hydromatic.sml.parse.ParseException;
-import net.hydromatic.sml.parse.SmlParserImpl;
-import net.hydromatic.sml.type.Binding;
-import net.hydromatic.sml.type.TypeSystem;
+import net.hydromatic.morel.ast.AstNode;
+import net.hydromatic.morel.compile.CompiledStatement;
+import net.hydromatic.morel.compile.Compiles;
+import net.hydromatic.morel.compile.Environment;
+import net.hydromatic.morel.foreign.ForeignValue;
+import net.hydromatic.morel.parse.MorelParserImpl;
+import net.hydromatic.morel.parse.ParseException;
+import net.hydromatic.morel.type.Binding;
+import net.hydromatic.morel.type.TypeSystem;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -106,7 +106,7 @@ private static BufferedReader buffer(Reader in) {
   public void run() {
     final TypeSystem typeSystem = new TypeSystem();
     final BufferingReader in2 = new BufferingReader(in);
-    final SmlParserImpl parser = new SmlParserImpl(in2);
+    final MorelParserImpl parser = new MorelParserImpl(in2);
     Environment env = Compiles.createEnvironment(typeSystem, valueMap);
     final List<String> lines = new ArrayList<>();
     final List<Binding> bindings = new ArrayList<>();

src/main/java/net/hydromatic/sml/Shell.java → src/main/java/net/hydromatic/morel/Shell.java

@@ -16,21 +16,21 @@
  * language governing permissions and limitations under the
  * License.
  */
-package net.hydromatic.sml;
+package net.hydromatic.morel;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 
-import net.hydromatic.sml.ast.AstNode;
-import net.hydromatic.sml.compile.CompileException;
-import net.hydromatic.sml.compile.CompiledStatement;
-import net.hydromatic.sml.compile.Compiles;
-import net.hydromatic.sml.compile.Environment;
-import net.hydromatic.sml.foreign.ForeignValue;
-import net.hydromatic.sml.parse.ParseException;
-import net.hydromatic.sml.parse.SmlParserImpl;
-import net.hydromatic.sml.type.Binding;
-import net.hydromatic.sml.type.TypeSystem;
+import net.hydromatic.morel.ast.AstNode;
+import net.hydromatic.morel.compile.CompileException;
+import net.hydromatic.morel.compile.CompiledStatement;
+import net.hydromatic.morel.compile.Compiles;
+import net.hydromatic.morel.compile.Environment;
+import net.hydromatic.morel.foreign.ForeignValue;
+import net.hydromatic.morel.parse.MorelParserImpl;
+import net.hydromatic.morel.parse.ParseException;
+import net.hydromatic.morel.type.Binding;
+import net.hydromatic.morel.type.TypeSystem;
 
 import org.jline.reader.EndOfFileException;
 import org.jline.reader.LineReader;
@@ -148,7 +148,7 @@ private void printAll(List<String> lines) {
 
   /** Generates a banner to be shown on startup. */
   private String banner() {
-    return "smlj version 0.1.0"
+    return "morel version 0.1.0"
         + " (java version \"" + System.getProperty("java.version")
         + "\", JRE " + System.getProperty("java.vendor.version")
         + " (build " + System.getProperty("java.vm.version")
@@ -192,7 +192,7 @@ public void run() {
       terminal.writer().println(banner());
     }
     LineReader reader = LineReaderBuilder.builder()
-        .appName("smlj")
+        .appName("morel")
         .terminal(terminal)
         .parser(parser)
         .variable(LineReader.SECONDARY_PROMPT_PATTERN, minusPrompt)
@@ -240,8 +240,8 @@ public void run() {
         if (pl.line().endsWith(";")) {
           final String code = buf.toString();
           buf.setLength(0);
-          final SmlParserImpl smlParser =
-              new SmlParserImpl(new StringReader(code));
+          final MorelParserImpl smlParser =
+              new MorelParserImpl(new StringReader(code));
           final AstNode statement;
           try {
             statement = smlParser.statementSemicolon();