eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug in Scala calculator

Browse Source
This commit is contained in:
Alexey Andreev 2015-10-21 21:09:44 +03:00
parent 8702f7ee33
commit db364f2adc
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
samples/scala/src/main/scala/org/teavm/samples/scala/Calculator.scala
View File

@ -7,7 +7,7 @@ object Calculator {
case Add(a, b) => eval(a) + eval(b)
case Subtract(a, b) => eval(a) - eval(b)
case Multiply(a, b) => eval(a) * eval(b)
case Divide(a, b) => eval(a) * eval(b)
case Divide(a, b) => eval(a) / eval(b)
case Negate(n) => -eval(n)
case Number(v) => v
}

6
samples/scala/src/main/scala/org/teavm/samples/scala/Client.scala
View File

@ -19,8 +19,10 @@ object Client {
case (None, _) => Window.alert("Error parsing expression");
case (Some(x), Nil) => {
resultList.insertBefore(doc.createElement("div", (elem : HTMLElement) => {
elem.withChild("span").withAttr("class", "plan").withText(print(x) + " = ")
elem.withChild("span").withAttr("class", "result").withText(eval(x).toString)
elem.withChild("span", (child : HTMLElement) =>
child.withAttr("class", "plan").withText(print(x) + " = "))
elem.withChild("span", (child : HTMLElement) =>
child.withAttr("class", "result").withText(eval(x).toString))
}), resultList.getFirstChild)
}
case (_, err) => Window.alert("Error parsing expression: " + err);

2
samples/scala/src/main/scala/org/teavm/samples/scala/Grammar.scala
View File

@ -47,7 +47,7 @@ object Rule {
}
rule(chars => {
val (result, rem) = iter(chars)
(Some(result.reverse), rem)
(Some(result), rem)
})
}
def firstOf[T](first : Rule[T], second : => Rule[T]) : Rule[T] = {