fixing the names to better align

MoeOrganization · Feb 23, 2013 · cd5230a · cd5230a
1 parent 54ce606
commit cd5230a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/src/main/scala/org/moe/interpreter/Interpreter.scala b/src/main/scala/org/moe/interpreter/Interpreter.scala
@@ -43,8 +43,8 @@ class Interpreter {
       // literals
 
       case IntLiteralNode(value)     => getInt(value)
-      case FloatLiteralNode(value)   => getFloat(value)
-      case StringLiteralNode(value)  => getString(value)
+      case FloatLiteralNode(value)   => getNum(value)
+      case StringLiteralNode(value)  => getStr(value)
       case BooleanLiteralNode(value) => getBool(value)
 
       case UndefLiteralNode() => getUndef
@@ -134,7 +134,7 @@ class Interpreter {
                 elems = elems :+ str
                 str = magicalStringIncrement(str)
               }
-              getArray(elems.map(getString(_)))
+              getArray(elems.map(getStr(_)))
             }
           }
           case _ => throw new MoeErrors.UnexpectedType("Pair of MoeIntObject or MoeStrObject expected")
@@ -155,12 +155,12 @@ class Interpreter {
             if (is_prefix) new_i else i
           }
           case n: MoeNumObject => {
-            val new_n = getFloat(n.unboxToDouble.get + 1.0)
+            val new_n = getNum(n.unboxToDouble.get + 1.0)
             env.set(varName, new_n)
             if (is_prefix) new_n else n
           }
           case s: MoeStrObject => {
-            val new_s = getString(magicalStringIncrement(s.unboxToString.get))
+            val new_s = getStr(magicalStringIncrement(s.unboxToString.get))
             env.set(varName, new_s)
             if (is_prefix) new_s else s
           }
@@ -176,7 +176,7 @@ class Interpreter {
             if (is_prefix) new_i else i
           }
           case n: MoeNumObject => {
-            val new_n = getFloat(n.unboxToDouble.get - 1.0)
+            val new_n = getNum(n.unboxToDouble.get - 1.0)
             env.set(varName, new_n)
             if (is_prefix) new_n else n
           }

diff --git a/src/main/scala/org/moe/runtime/MoeRuntime.scala b/src/main/scala/org/moe/runtime/MoeRuntime.scala
@@ -156,10 +156,10 @@ class MoeRuntime (
     def getTrue  = True
     def getFalse = False
 
-    def getInt    (value: Int)     = new MoeIntObject(value, getCoreClassFor("Int"))
-    def getFloat  (value: Double)  = new MoeNumObject(value, getCoreClassFor("Num"))
-    def getString (value: String)  = new MoeStrObject(value, getCoreClassFor("Str"))
-    def getBool   (value: Boolean) = if (value) { True } else { False }
+    def getInt  (value: Int)     = new MoeIntObject(value, getCoreClassFor("Int"))
+    def getNum  (value: Double)  = new MoeNumObject(value, getCoreClassFor("Num"))
+    def getStr  (value: String)  = new MoeStrObject(value, getCoreClassFor("Str"))
+    def getBool (value: Boolean) = if (value) { True } else { False }
 
     def getHash  (value: HashMap[String, MoeObject]) = new MoeHashObject(value, getCoreClassFor("Hash"))
     def getHash  ()                                  = new MoeHashObject(HashMap(), getCoreClassFor("Hash"))

diff --git a/src/main/scala/org/moe/runtime/builtins/IntClass.scala b/src/main/scala/org/moe/runtime/builtins/IntClass.scala
@@ -25,7 +25,7 @@ object IntClass {
         { (invocant, args) =>
           args(0) match {
             case i: MoeIntObject   => getInt(invocant.unboxToInt.get + i.unboxToInt.get)
-            case f: MoeNumObject => getFloat(invocant.unboxToDouble.get + f.unboxToDouble.get)
+            case f: MoeNumObject => getNum(invocant.unboxToDouble.get + f.unboxToDouble.get)
             case _                 => throw new MoeErrors.UnexpectedType(args(0).toString)
           }
         }
@@ -38,7 +38,7 @@ object IntClass {
         { (invocant, args) =>
           args(0) match {
             case i: MoeIntObject   => getInt(invocant.unboxToInt.get * i.unboxToInt.get)
-            case f: MoeNumObject => getFloat(invocant.unboxToDouble.get * f.unboxToDouble.get)
+            case f: MoeNumObject => getNum(invocant.unboxToDouble.get * f.unboxToDouble.get)
             case _                 => throw new MoeErrors.UnexpectedType(args(0).toString)
           }
         }

diff --git a/src/main/scala/org/moe/runtime/builtins/NumClass.scala b/src/main/scala/org/moe/runtime/builtins/NumClass.scala
@@ -20,7 +20,7 @@ object NumClass {
       new MoeMethod(
         "infix:<+>",
         { (invocant, args) =>
-          getFloat(invocant.unboxToDouble.get + args(0).unboxToDouble.get)
+          getNum(invocant.unboxToDouble.get + args(0).unboxToDouble.get)
         }
       )
     )