Removed callName from the Callable objects. It was not needed. Also c…

…leaned up message for division by zero exception.
kentdlee · Jan 16, 2014 · 9cccfce · 9cccfce
1 parent 63730bb
commit 9cccfce
Show file tree

Hide file tree

Showing 22 changed files with 32 additions and 54 deletions.
diff --git a/PyAttr.cpp b/PyAttr.cpp
@@ -37,9 +37,6 @@ PyType* PyAttr::getType() {
     return PyTypes[PyBuiltInType];
 }
 
-string PyAttr::callName() {
-    return method;
-}
 
 PyObject* PyAttr::__call__(vector<PyObject*>* args) {
     return self->callMethod(method,args);

diff --git a/PyAttr.h b/PyAttr.h
@@ -31,7 +31,6 @@ class PyAttr : public PyCallable {
     PyAttr(PyObject* self, string method);
     virtual ~PyAttr();
     bool allowableArgCount(int count);
-    virtual string callName();
 
     PyType* getType();
     string toString();

diff --git a/PyBuiltInConcat.cpp b/PyBuiltInConcat.cpp
@@ -55,10 +55,6 @@ PyObject* PyBuiltInConcat::__call__(vector<PyObject*>* args) {
     return x->callMethod("concat",callArgs);
 }
 
-string PyBuiltInConcat::callName() {
-    return "concat";
-}
-
 string PyBuiltInConcat::toString() {
-    return callName();
+    return "concat";
 }
diff --git a/PyBuiltInConcat.h b/PyBuiltInConcat.h
@@ -32,7 +32,6 @@ class PyBuiltInConcat : public PyCallable {
     virtual ~PyBuiltInConcat();
     PyType* getType();
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 
 protected:

diff --git a/PyBuiltInFPrint.cpp b/PyBuiltInFPrint.cpp
@@ -94,10 +94,6 @@ PyObject* PyBuiltInFPrint::__call__(vector<PyObject*>* args) {
     return this;
 }
 
-string PyBuiltInFPrint::callName() {
-    return "fprint";
-}
-
 string PyBuiltInFPrint::toString() {
-    return callName();
+    return "fprint";
 }
diff --git a/PyBuiltInFPrint.h b/PyBuiltInFPrint.h
@@ -31,7 +31,6 @@ class PyBuiltInFPrint : public PyCallable {
     PyType* getType();
 
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 
 protected:

diff --git a/PyBuiltInInput.cpp b/PyBuiltInInput.cpp
@@ -72,10 +72,6 @@ PyObject* PyBuiltInInput::__call__(vector<PyObject*>* args) {
     return new PyStr(s.str());
 }
 
-string PyBuiltInInput::callName() {
-    return "input";
-}
-
 string PyBuiltInInput::toString() {
-    return callName();
+    return "input";
 }
diff --git a/PyBuiltInInput.h b/PyBuiltInInput.h
@@ -31,7 +31,6 @@ class PyBuiltInInput : public PyCallable {
     PyType* getType();
 
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 protected:
     virtual PyObject* __call__(vector<PyObject*>* args);

diff --git a/PyBuiltInIter.cpp b/PyBuiltInIter.cpp
@@ -52,10 +52,6 @@ PyObject* PyBuiltInIter::__call__(vector<PyObject*>* args) {
     return result;
 }
 
-string PyBuiltInIter::callName() {
-    return "iter";
-}
-
 string PyBuiltInIter::toString() {
-    return callName();
+    return "iter";
 }
diff --git a/PyBuiltInIter.h b/PyBuiltInIter.h
@@ -32,7 +32,6 @@ class PyBuiltInIter : public PyCallable {
     PyType* getType();
 
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 protected:
     virtual PyObject* __call__(vector<PyObject*>* args);

diff --git a/PyBuiltInLen.cpp b/PyBuiltInLen.cpp
@@ -54,10 +54,6 @@ PyObject* PyBuiltInLen::__call__(vector<PyObject*>* args) {
     return x->callMethod("__len__",callArgs);
 }
 
-string PyBuiltInLen::callName() {
-    return "len";
-}
-
 string PyBuiltInLen::toString() {
-    return callName();
+    return "len";
 }
diff --git a/PyBuiltInLen.h b/PyBuiltInLen.h
@@ -29,7 +29,6 @@ class PyBuiltInLen : public PyCallable {
     virtual ~PyBuiltInLen();
     PyType* getType();
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 
 protected:

diff --git a/PyBuiltInPrint.cpp b/PyBuiltInPrint.cpp
@@ -58,10 +58,6 @@ PyObject* PyBuiltInPrint::__call__(vector<PyObject*>* args) {
     return new PyNone();
 }
 
-string PyBuiltInPrint::callName() {
-    return "print";
-}
-
 string PyBuiltInPrint::toString() {
-    return callName();
+    return "print";
 }
diff --git a/PyBuiltInPrint.h b/PyBuiltInPrint.h
@@ -30,7 +30,6 @@ class PyBuiltInPrint : public PyCallable {
     virtual ~PyBuiltInPrint();
     PyType* getType();
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 
 private:

diff --git a/PyBuiltInTPrint.cpp b/PyBuiltInTPrint.cpp
@@ -113,10 +113,6 @@ PyObject* PyBuiltInTPrint::__call__(vector<PyObject*>* args) {
     return new PyNone();
 }
 
-string PyBuiltInTPrint::callName() {
-    return "tprint";
-}
-
 string PyBuiltInTPrint::toString() {
-    return callName();
+    return "tprint";
 }
diff --git a/PyBuiltInTPrint.h b/PyBuiltInTPrint.h
@@ -30,7 +30,6 @@ class PyBuiltInTPrint : public PyCallable {
     virtual ~PyBuiltInTPrint();
     PyType* getType();
     bool allowableArgCount(int count);
-    string callName();
     string toString();
 
 protected:

diff --git a/PyCallable.h b/PyCallable.h
@@ -45,7 +45,6 @@ class PyCallable : public PyObject {
     PyCallable();
     PyCallable(const PyCallable& orig);
     virtual ~PyCallable();
-    virtual string callName() = 0;
 
 protected:
     virtual PyObject* __call__(vector<PyObject*>* args);

diff --git a/PyInt.cpp b/PyInt.cpp
@@ -152,13 +152,13 @@ PyObject* PyInt::__truediv__(vector<PyObject*>* args) {
         case PyIntType:
             x = (PyInt*) arg;
             if (x->val == 0)
-                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "Division By Zero Error");
+                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "ZeroDivisionError: integer division or modulo by zero");
             return new PyFloat(this->val / x->val);
 
         case PyFloatType:
             y = (PyFloat*) arg;
             if (y->getVal() == 0)
-                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "Division By Zero Error");
+                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "ZeroDivisionError: integer division or modulo by zero");
             return new PyFloat(this->val / y->getVal());
 
         default:
@@ -182,13 +182,13 @@ PyObject* PyInt::__floordiv__(vector<PyObject*>* args) {
         case PyIntType:
             x = (PyInt*) arg;
             if (x->val == 0)
-                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "Division By Zero Error");
+                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "ZeroDivisionError: integer division or modulo by zero");
             return new PyInt(this->val / x->val);
 
         case PyFloatType:
             y = (PyFloat*) arg;
             if (y->getVal() == 0)
-                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "Division By Zero Error");
+                throw new PyException(PYILLEGALOPERATIONEXCEPTION, "ZeroDivisionError: integer division or modulo by zero");
 
             return new PyFloat(floor(this->val / y->getVal()));
 

diff --git a/main.cpp b/main.cpp
@@ -153,7 +153,7 @@ void sigHandler(int signum) {
     cerr << "*********************************************************" << endl;
     cerr << "            An Uncaught Exception Occurred" << endl;
     cerr << "*********************************************************" << endl;
-    cerr << "The exception was:\n";
+    cerr << "Signal: ";
     switch (signum) {
         case SIGABRT:
             cerr << "Program Execution Aborted" << endl;
@@ -353,15 +353,15 @@ int main(int argc, char* argv[]) {
         cerr << "*********************************************************" << endl;
         cerr << "            An Uncaught Exception Occurred" << endl;
         cerr << "*********************************************************" << endl;
-        cerr << "The exception was: " << ex->toString() << endl;
+        cerr << ex->toString() << endl;
         cerr << "---------------------------------------------------------" << endl;
         cerr << "              The Exception's Traceback" << endl;
         cerr << "---------------------------------------------------------" << endl;
         ex->printTraceBack();
         cerr << "*********************************************************" << endl;
         cerr << "            An Uncaught Exception Occurred (See Above) " << endl;
         cerr << "*********************************************************" << endl;
-        cerr << "The exception was: " << ex->toString() << endl;        
+        cerr << ex->toString() << endl;        
         cerr << "*********************************************************" << endl;
     } 
 

diff --git a/tests/testcall.casm b/tests/testcall.casm
@@ -0,0 +1,8 @@
+Function: main/0
+Constants: None, 5
+Globals: print
+BEGIN
+          LOAD_CONST                     1
+          CALL_FUNCTION                  0
+          RETURN_VALUE             
+END
diff --git a/tests/testcall2.casm b/tests/testcall2.casm
@@ -0,0 +1,9 @@
+Function: main/0
+Constants: None, 5, 0
+Globals: print
+BEGIN
+          LOAD_CONST                     1
+          LOAD_CONST                     2
+          BINARY_TRUE_DIVIDE 
+          RETURN_VALUE             
+END
diff --git a/tests/testit.py b/tests/testit.py
@@ -0,0 +1 @@
+5 / 0