Merge branch 'hotfix/0.3.1-RC1'

CHANGELOG.md

@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 ## [Unreleased]
 
+## [0.3.1-RC1] - 2019-05-7
+### Changed
+- EEC is renamed to Mesa
+
 ## [0.3.0-RC1] - 2019-05-7
 ### Added
 - A Prelude library, containing data definitions for encodings of sums and
@@ -94,7 +98,8 @@ All notable changes to this project will be documented in this file.
   - Source files use `.hs` suffix at present to benefit from syntax highlighting.
   - Refer to [eec/src/main/antlr4/EEC.g4](eec/src/main/antlr4/EEC.g4) for a context free grammar.
 
-[Unreleased]: https://github.com/bishabosha/EEC/compare/0.3.0-RC1...develop
+[Unreleased]: https://github.com/bishabosha/EEC/compare/0.3.1-RC1...develop
+[0.3.1-RC1]: https://github.com/bishabosha/EEC/releases/tag/0.3.1-RC1
 [0.3.0-RC1]: https://github.com/bishabosha/EEC/releases/tag/0.3.0-RC1
 [0.2.3-RC1]: https://github.com/bishabosha/EEC/releases/tag/0.2.3-RC1
 [0.2.2-RC1]: https://github.com/bishabosha/EEC/releases/tag/0.2.2-RC1

eec/README.md

@@ -1,4 +1,4 @@
-# EEC 0.3.0-RC1
+# Mesa 0.3.1-RC1
 
 ## Requirements
 * sbt 1.2.8

eec/build.sbt

@@ -10,8 +10,8 @@ antlr4GenVisitor in Antlr4  := false // default: false
 lazy val root = project
   .in(file("."))
   .settings(
-    name := "eec",
-    version := "0.3.0-RC1",
+    name := "mesa-core",
+    version := "0.3.1-RC1",
 
     compileOrder := CompileOrder.JavaThenScala,
 

eec/src/main/antlr4/EEC.g4 → eec/src/main/antlr4/Mesa.g4

@@ -21,7 +21,7 @@
  */
 /*Derived from https://github.com/antlr/grammars-v4/blob/master/scala/Scala.g4
  */
-grammar EEC;
+grammar Mesa;
 
 literal:
 	IntegerLiteral

eec/src/main/scala/eec/Main.scala

@@ -8,7 +8,7 @@ object Main {
     if args `sameElements` Array("-help") then {
       println("Usage: eec <option>")
       println
-      println("  -e    => run EEC REPL")
+      println("  -e    => run Mesa REPL")
       println("  -p    => modifier for -e to load the REPL with Prelude definitions.")
       println("  -help => view these options")
     } else if args `sameElements` Array("-e") then {

eec/src/main/scala/eec/compiler/parsing/EntryPoint.scala

@@ -8,7 +8,7 @@ import error.CompilerErrors.Lifted
 import core.Contexts.IdReader
 
 object EntryPoint {
-  val parseEEC: String => IdReader[Lifted[Tree]] =
+  val parseMesa: String => IdReader[Lifted[Tree]] =
     eecParser `toTreeParser` fromTranslationUnit
 
   val parseDef: String => IdReader[Lifted[Tree]] =

eec/src/main/scala/eec/compiler/parsing/Parsers.scala

@@ -23,7 +23,7 @@ import Constants._
 import core.Constants.Constant._
 import Modifiers.{Modifier}
 import Modifier._
-import EECParser._
+import MesaParser._
 import types.Types.TypeOps._
 import error.CompilerErrors._
 
@@ -946,11 +946,11 @@ object Parsers {
     }
   }
 
-  private def genParser(input: String): EECParser = {
+  private def genParser(input: String): MesaParser = {
     val charStream  = new ANTLRInputStream(input)
-    val lexer       = new EECLexer(charStream)
+    val lexer       = new MesaLexer(charStream)
     val tokens      = new CommonTokenStream(lexer)
-    val parser      = new EECParser(tokens)
+    val parser      = new MesaParser(tokens)
     lexer.removeErrorListeners
     lexer.addErrorListener(eecErrorListener)
     parser.removeErrorListeners

eec/src/main/scala/eec/repl/Repl.scala

@@ -16,7 +16,7 @@ import Meta.ContextOps._
 import Contexts.{Context, IdGen, RootContext, IdReader}
 import Names.{Name, NameOps}
 import Context._
-import parsing.EntryPoint.{parseEEC, parseDef, parseExpr}
+import parsing.EntryPoint.{parseMesa, parseDef, parseExpr}
 import error.CompilerErrors.{CompilerError, CompilerErrorOps, Lifted}
 import CompilerErrorOps._
 import types.{Namers, Typers, Types, Prelude}
@@ -161,7 +161,7 @@ object Repl {
         Ast(name) { n =>
           for
             code  <- loadFile(state.pwd, n)
-            ast   <- parseEEC(code)
+            ast   <- parseMesa(code)
           yield ast
         }
 
@@ -172,7 +172,7 @@ object Repl {
         Typed(name) { n =>
           for
             code  <- loadFile(state.pwd, n)
-            ast   <- parseEEC(code)
+            ast   <- parseMesa(code)
           yield ast
         }