Skip to content

Commit

Permalink
Update forth to latest canoncial json. Refs #488 (#573)
Browse files Browse the repository at this point in the history 
* Update forth to latest canoncial json. Refs #488

* Update example.scala

fix spelling error
  • Loading branch information
@ricemery @ErikSchierboom
ricemery authored and ErikSchierboom committed Jul 23, 2018
1 parent 49336a6 commit 7ef198a
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 61 deletions.
32 changes: 18 additions & 14 deletions exercises/forth/example.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,11 @@ case class UserDef(userTerm: String, definitions: List[TermDefinition]) extends
case Left(_) => state
case Right(fs) =>
val fsMap = fs.asInstanceOf[ForthState].definitions
val updatedMap = fsMap + (userTerm -> definitions)
val substitutedDefs: List[Definition] = definitions.flatMap {
case PossibleUser(s) => fsMap(s)
case d@(_: Definition) => List(d)
}
val updatedMap = fsMap + (userTerm -> substitutedDefs)
val stack = fs.asInstanceOf[ForthState].stack
Right(ForthState(stack, updatedMap))
}
Expand All @@ -230,20 +234,20 @@ class Forth extends ForthEvaluator with RegexParsers {

override protected val whiteSpace: Regex = "(?U)(\\s|[\\u0000-\\u001f])+".r

private def word: Parser[TermDefinition] = "(?U)[\\S&&[^;]&&[^0-9]]+".r ^^ { s => {
s.toLowerCase match {
case Definitions.add => Add()
case Definitions.subtract => Subtract()
case Definitions.multiply => Multiply()
case Definitions.divide => Divide()
case Definitions.dup => Dup()
case Definitions.drop => Drop()
case Definitions.swap => Swap()
case Definitions.over => Over()
case possibleUserWord: String => PossibleUser(possibleUserWord)
}
private def word: Parser[TermDefinition] = "(?U)[\\S&&[^;]&&[^0-9]]+".r ^^ { s => {
s.toLowerCase match {
case Definitions.add => Add()
case Definitions.subtract => Subtract()
case Definitions.multiply => Multiply()
case Definitions.divide => Divide()
case Definitions.dup => Dup()
case Definitions.drop => Drop()
case Definitions.swap => Swap()
case Definitions.over => Over()
case possibleUserWord: String => PossibleUser(possibleUserWord)
}
}
}

private def userDefinition: Parser[TermDefinition] = (":" ~> "(?U)[\\S&&[^0-9]]+".r ~ rep(word | number) <~ ";") ^^ {
case userDef: Forth.this.~[String, List[TermDefinition]] => UserDef(userDef._1.toLowerCase, userDef._2)
Expand All @@ -258,4 +262,4 @@ class Forth extends ForthEvaluator with RegexParsers {
defs.foldLeft(Right(EmptyState): Either[ForthError, ForthEvaluatorState])((acc, definition: TermDefinition) => definition.evaluate(acc))
case NoSuccess(_, _) => Left(ForthError.InvalidWord)
}
}
}
120 changes: 73 additions & 47 deletions exercises/forth/src/test/scala/ForthTest.scala
View file
Original file line number Diff line number Diff line change
@@ -1,226 +1,252 @@
import org.scalatest.{Matchers, FunSuite}

/** @version 1.5.0 */
/** @version 1.6.0 */
class ForthTest extends FunSuite with Matchers {

private val forth = new Forth

test("parsing and numbers - numbers just get pushed onto the stack") {
forth.eval("1 2 3 4 5").fold(_ => "", _.toString) should be ("1 2 3 4 5")
forth.eval("1 2 3 4 5").fold(_ => "", _.toString) should be("1 2 3 4 5")
}

test("addition - can add two numbers") {
pending
forth.eval("1 2 +").fold(_ => "", _.toString) should be ("3")
forth.eval("1 2 +").fold(_ => "", _.toString) should be("3")
}

test("addition - errors if there is nothing on the stack") {
pending
forth.eval("+").isLeft should be (true)
forth.eval("+").isLeft should be(true)
}

test("addition - errors if there is only one value on the stack") {
pending
forth.eval("1 +").isLeft should be (true)
forth.eval("1 +").isLeft should be(true)
}

test("subtraction - can subtract two numbers") {
pending
forth.eval("3 4 -").fold(_ => "", _.toString) should be ("-1")
forth.eval("3 4 -").fold(_ => "", _.toString) should be("-1")
}

test("subtraction - errors if there is nothing on the stack") {
pending
forth.eval("-").isLeft should be (true)
forth.eval("-").isLeft should be(true)
}

test("subtraction - errors if there is only one value on the stack") {
pending
forth.eval("1 -").isLeft should be (true)
forth.eval("1 -").isLeft should be(true)
}

test("multiplication - can multiply two numbers") {
pending
forth.eval("2 4 *").fold(_ => "", _.toString) should be ("8")
forth.eval("2 4 *").fold(_ => "", _.toString) should be("8")
}

test("multiplication - errors if there is nothing on the stack") {
pending
forth.eval("*").isLeft should be (true)
forth.eval("*").isLeft should be(true)
}

test("multiplication - errors if there is only one value on the stack") {
pending
forth.eval("1 *").isLeft should be (true)
forth.eval("1 *").isLeft should be(true)
}

test("division - can divide two numbers") {
pending
forth.eval("12 3 /").fold(_ => "", _.toString) should be ("4")
forth.eval("12 3 /").fold(_ => "", _.toString) should be("4")
}

test("division - performs integer division") {
pending
forth.eval("8 3 /").fold(_ => "", _.toString) should be ("2")
forth.eval("8 3 /").fold(_ => "", _.toString) should be("2")
}

test("division - errors if dividing by zero") {
pending
forth.eval("4 0 /").isLeft should be (true)
forth.eval("4 0 /").isLeft should be(true)
}

test("division - errors if there is nothing on the stack") {
pending
forth.eval("/").isLeft should be (true)
forth.eval("/").isLeft should be(true)
}

test("division - errors if there is only one value on the stack") {
pending
forth.eval("1 /").isLeft should be (true)
forth.eval("1 /").isLeft should be(true)
}

test("combined arithmetic - addition and subtraction") {
pending
forth.eval("1 2 + 4 -").fold(_ => "", _.toString) should be ("-1")
forth.eval("1 2 + 4 -").fold(_ => "", _.toString) should be("-1")
}

test("combined arithmetic - multiplication and division") {
pending
forth.eval("2 4 * 3 /").fold(_ => "", _.toString) should be ("2")
forth.eval("2 4 * 3 /").fold(_ => "", _.toString) should be("2")
}

test("dup - copies a value on the stack") {
pending
forth.eval("1 dup").fold(_ => "", _.toString) should be ("1 1")
forth.eval("1 dup").fold(_ => "", _.toString) should be("1 1")
}

test("dup - copies the top value on the stack") {
pending
forth.eval("1 2 dup").fold(_ => "", _.toString) should be ("1 2 2")
forth.eval("1 2 dup").fold(_ => "", _.toString) should be("1 2 2")
}

test("dup - errors if there is nothing on the stack") {
pending
forth.eval("dup").isLeft should be (true)
forth.eval("dup").isLeft should be(true)
}

test("drop - removes the top value on the stack if it is the only one") {
pending
forth.eval("1 drop").fold(_ => "", _.toString) should be ("")
forth.eval("1 drop").fold(_ => "", _.toString) should be("")
}

test("drop - removes the top value on the stack if it is not the only one") {
pending
forth.eval("1 2 drop").fold(_ => "", _.toString) should be ("1")
forth.eval("1 2 drop").fold(_ => "", _.toString) should be("1")
}

test("drop - errors if there is nothing on the stack") {
pending
forth.eval("drop").isLeft should be (true)
forth.eval("drop").isLeft should be(true)
}

test("swap - swaps the top two values on the stack if they are the only ones") {
pending
forth.eval("1 2 swap").fold(_ => "", _.toString) should be ("2 1")
forth.eval("1 2 swap").fold(_ => "", _.toString) should be("2 1")
}

test("swap - swaps the top two values on the stack if they are not the only ones") {
test(
"swap - swaps the top two values on the stack if they are not the only ones") {
pending
forth.eval("1 2 3 swap").fold(_ => "", _.toString) should be ("1 3 2")
forth.eval("1 2 3 swap").fold(_ => "", _.toString) should be("1 3 2")
}

test("swap - errors if there is nothing on the stack") {
pending
forth.eval("swap").isLeft should be (true)
forth.eval("swap").isLeft should be(true)
}

test("swap - errors if there is only one value on the stack") {
pending
forth.eval("1 swap").isLeft should be (true)
forth.eval("1 swap").isLeft should be(true)
}

test("over - copies the second element if there are only two") {
pending
forth.eval("1 2 over").fold(_ => "", _.toString) should be ("1 2 1")
forth.eval("1 2 over").fold(_ => "", _.toString) should be("1 2 1")
}

test("over - copies the second element if there are more than two") {
pending
forth.eval("1 2 3 over").fold(_ => "", _.toString) should be ("1 2 3 2")
forth.eval("1 2 3 over").fold(_ => "", _.toString) should be("1 2 3 2")
}

test("over - errors if there is nothing on the stack") {
pending
forth.eval("over").isLeft should be (true)
forth.eval("over").isLeft should be(true)
}

test("over - errors if there is only one value on the stack") {
pending
forth.eval("1 over").isLeft should be (true)
forth.eval("1 over").isLeft should be(true)
}

test("user-defined words - can consist of built-in words") {
pending
forth.eval(": dup-twice dup dup ; 1 dup-twice").fold(_ => "", _.toString) should be ("1 1 1")
forth
.eval(": dup-twice dup dup ; 1 dup-twice")
.fold(_ => "", _.toString) should be("1 1 1")
}

test("user-defined words - execute in the right order") {
pending
forth.eval(": countup 1 2 3 ; countup").fold(_ => "", _.toString) should be ("1 2 3")
forth.eval(": countup 1 2 3 ; countup").fold(_ => "", _.toString) should be(
"1 2 3")
}

test("user-defined words - can override other user-defined words") {
pending
forth.eval(": foo dup ; : foo dup dup ; 1 foo").fold(_ => "", _.toString) should be ("1 1 1")
forth
.eval(": foo dup ; : foo dup dup ; 1 foo")
.fold(_ => "", _.toString) should be("1 1 1")
}

test("user-defined words - can override built-in words") {
pending
forth.eval(": swap dup ; 1 swap").fold(_ => "", _.toString) should be ("1 1")
forth.eval(": swap dup ; 1 swap").fold(_ => "", _.toString) should be("1 1")
}

test("user-defined words - can override built-in operators") {
pending
forth.eval(": + * ; 3 4 +").fold(_ => "", _.toString) should be ("12")
forth.eval(": + * ; 3 4 +").fold(_ => "", _.toString) should be("12")
}

test("user-defined words - can use different words with the same name") {
pending
forth
.eval(": foo 5 ; : bar foo ; : foo 6 ; bar foo")
.fold(_ => "", _.toString) should be("5 6")
}

test("user-defined words - can define word that uses word with the same name") {
pending
forth
.eval(": foo 10 ; : foo foo 1 + ; foo")
.fold(_ => "", _.toString) should be("11")
}

test("user-defined words - cannot redefine numbers") {
pending
forth.eval(": 1 2 ;").isLeft should be (true)
forth.eval(": 1 2 ;").isLeft should be(true)
}

test("user-defined words - errors if executing a non-existent word") {
pending
forth.eval("foo").isLeft should be (true)
forth.eval("foo").isLeft should be(true)
}

test("case-insensitivity - DUP is case-insensitive") {
pending
forth.eval("1 DUP Dup dup").fold(_ => "", _.toString) should be ("1 1 1 1")
forth.eval("1 DUP Dup dup").fold(_ => "", _.toString) should be("1 1 1 1")
}

test("case-insensitivity - DROP is case-insensitive") {
pending
forth.eval("1 2 3 4 DROP Drop drop").fold(_ => "", _.toString) should be ("1")
forth.eval("1 2 3 4 DROP Drop drop").fold(_ => "", _.toString) should be(
"1")
}

test("case-insensitivity - SWAP is case-insensitive") {
pending
forth.eval("1 2 SWAP 3 Swap 4 swap").fold(_ => "", _.toString) should be ("2 3 4 1")
forth.eval("1 2 SWAP 3 Swap 4 swap").fold(_ => "", _.toString) should be(
"2 3 4 1")
}

test("case-insensitivity - OVER is case-insensitive") {
pending
forth.eval("1 2 OVER Over over").fold(_ => "", _.toString) should be ("1 2 1 2 1")
forth.eval("1 2 OVER Over over").fold(_ => "", _.toString) should be(
"1 2 1 2 1")
}

test("case-insensitivity - user-defined words are case-insensitive") {
pending
forth.eval(": foo dup ; 1 FOO Foo foo").fold(_ => "", _.toString) should be ("1 1 1 1")
forth.eval(": foo dup ; 1 FOO Foo foo").fold(_ => "", _.toString) should be(
"1 1 1 1")
}

test("case-insensitivity - definitions are case-insensitive") {
pending
forth.eval(": SWAP DUP Dup dup ; 1 swap").fold(_ => "", _.toString) should be ("1 1 1 1")
forth
.eval(": SWAP DUP Dup dup ; 1 swap")
.fold(_ => "", _.toString) should be("1 1 1 1")
}
}
}

0 comments on commit 7ef198a

Please sign in to comment.