Require mspcore instead of mspmisc

Remove C-style casts
Report location with "Wrong number of arguments" errors

diff --git a/Build b/Build
index ea1921ed9b3ec9194b726c56292d2ce262c5e8bc..5c826b0d1ff913074d084f6b33e0a69ec9200ef7 100644 (file)
--- a/Build
+++ b/Build
@@ -3,7 +3,7 @@ package "mspparser"
        version "0.2";
        description "Mikkosoft Productions datafile parser";
 
-       require "mspmisc";
+       require "mspcore";
 
        library "mspparser"
        {

diff --git a/source/input.h b/source/input.h
index e1b2d87e0e9ea1b8e3d997012d1ef08ee1417da5..f5cd3ed24c605797aa0223f5d922cc1ea87f2d01 100644 (file)
--- a/source/input.h
+++ b/source/input.h
@@ -18,7 +18,7 @@ public:
        int get();
        int peek();
        unsigned get_line_number() const { return line; }
-       operator bool() const { return (bool)in; }
+       operator bool() const { return in; }
 private:
        std::istream ∈
        unsigned line;

diff --git a/source/loader.h b/source/loader.h
index c6936f96f6eef5869f62ffe3ed9307f34038dd2c..39a50d0b7fe4a56b88a28ec1be68c82e78ed0d5e 100644 (file)
--- a/source/loader.h
+++ b/source/loader.h
@@ -8,7 +8,7 @@ Distributed under the LGPL
 
 #include <fstream>
 #include <map>
-#include <msp/error.h>
+#include "error.h"
 #include "parser.h"
 #include "statement.h"
 #include "value.h"
@@ -37,7 +37,7 @@ public:
        LoaderFunc0(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=0) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=0) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)();
        };
 private:
@@ -53,7 +53,7 @@ public:
        LoaderFunc1(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>());
        }
 private:
@@ -69,7 +69,7 @@ public:
        LoaderFunc2(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=2) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=2) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>());
        }
 private:
@@ -85,7 +85,7 @@ public:
        LoaderFunc3(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=3) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=3) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>());
        }
 private:
@@ -101,7 +101,7 @@ public:
        LoaderFunc4(FuncType f): func(f) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=4) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=4) throw TypeError(st.get_location()+": Wrong number of arguments");
                (dynamic_cast<L &>(l).*func)(st.args[0].get<A0>(), st.args[1].get<A1>(), st.args[2].get<A2>(), st.args[3].get<A3>());
        }
 private:
@@ -117,7 +117,7 @@ public:
        LoadValue(PointerType p): ptr(p) { }
        void execute(Loader &l, const Statement &st) const
        {
-               if(st.args.size()!=1) throw TypeError("Wrong number of arguments");
+               if(st.args.size()!=1) throw TypeError(st.get_location()+": Wrong number of arguments");
                dynamic_cast<typename L::Loader &>(l).get_object().*ptr=st.args[0].get<T>();
        }
 private:

diff --git a/source/parser.h b/source/parser.h
index c8b7ecef4e72f1c168980ca3b130bdc7f5a4f713..9b847c6675d7d397904b190355767c7b807c525f 100644 (file)
--- a/source/parser.h
+++ b/source/parser.h
@@ -21,7 +21,7 @@ class Parser
 public:
        Parser(std::istream &, const std::string &);
        Statement parse();
-       operator bool() const { return (bool)in; }
+       operator bool() const { return in; }
 private:
        Input       in;
        std::string src;