Solidity parser, can not parse much yet.

2 files changed, 70 insertions, 19 deletions

diff --git a/solidityParser.cpp b/solidityParser.cpp
new file mode 100644
index 00000000..f4250676
--- /dev/null
+++ b/solidityParser.cpp
@@ -0,0 +1,52 @@
+/*
+    This file is part of cpp-ethereum.
+
+    cpp-ethereum is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    cpp-ethereum is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with cpp-ethereum.  If not, see <http://www.gnu.org/licenses/>.
+*/
+/**
+ * @author Christian <c@ethdev.com>
+ * @date 2014
+ * Unit tests for the solidity parser.
+ */
+
+#include <string>
+
+#include <libsolidity/Scanner.h>
+#include <libsolidity/Parser.h>
+#include <boost/test/unit_test.hpp>
+
+namespace dev {
+namespace solidity {
+namespace test {
+
+BOOST_AUTO_TEST_SUITE(SolidityParser)
+
+BOOST_AUTO_TEST_CASE(smoke_test)
+{
+    std::string text = "contract test123 {\n"
+                       "\tuint256 stateVariable1;\n"
+                       "}\n";
+    Parser parser;
+    CharStream str(text);
+    // @todo: figure out why this does not compile
+    //Scanner scanner(CharStream(text));
+    Scanner scanner(str);
+    BOOST_CHECK_NO_THROW(parser.parse(scanner));
+}
+
+
+BOOST_AUTO_TEST_SUITE_END()
+
+} } } // end namespaces
+
diff --git a/solidityScanner.cpp b/solidityScanner.cpp
index afbcdffa..7f84146a 100644
--- a/solidityScanner.cpp
+++ b/solidityScanner.cpp
@@ -27,21 +27,26 @@ namespace dev {
 namespace solidity {
 namespace test {
 
-BOOST_AUTO_TEST_SUITE(solidity)
+BOOST_AUTO_TEST_SUITE(SolidityScanner)
+
+BOOST_AUTO_TEST_CASE(test_empty)
+{
+    Scanner scanner(CharStream(""));
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::EOS);
+}
 
 BOOST_AUTO_TEST_CASE(smoke_test)
 {
     Scanner scanner(CharStream("function break;765  \t  \"string1\",'string2'\nidentifier1"));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::FUNCTION);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::FUNCTION);
     BOOST_CHECK_EQUAL(scanner.next(), Token::BREAK);
     BOOST_CHECK_EQUAL(scanner.next(), Token::SEMICOLON);
     BOOST_CHECK_EQUAL(scanner.next(), Token::NUMBER);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), "765");
-    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING);
+    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING_LITERAL);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), "string1");
     BOOST_CHECK_EQUAL(scanner.next(), Token::COMMA);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING);
+    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING_LITERAL);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), "string2");
     BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), "identifier1");
@@ -51,26 +56,23 @@ BOOST_AUTO_TEST_CASE(smoke_test)
 BOOST_AUTO_TEST_CASE(string_escapes)
 {
     Scanner scanner(CharStream("  { \"a\\x61\""));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::LBRACE);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::LBRACE);
+    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING_LITERAL);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), "aa");
 }
 
 BOOST_AUTO_TEST_CASE(string_escapes_with_zero)
 {
     Scanner scanner(CharStream("  { \"a\\x61\\x00abc\""));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::LBRACE);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::LBRACE);
+    BOOST_CHECK_EQUAL(scanner.next(), Token::STRING_LITERAL);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), std::string("aa\0abc", 6));
 }
 
 BOOST_AUTO_TEST_CASE(string_escape_illegal)
 {
     Scanner scanner(CharStream(" bla \"\\x6rf\" (illegalescape)"));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::IDENTIFIER);
     BOOST_CHECK_EQUAL(scanner.next(), Token::ILLEGAL);
     BOOST_CHECK_EQUAL(scanner.getCurrentLiteral(), "");
     // TODO recovery from illegal tokens should be improved
@@ -83,8 +85,7 @@ BOOST_AUTO_TEST_CASE(string_escape_illegal)
 BOOST_AUTO_TEST_CASE(hex_numbers)
 {
     Scanner scanner(CharStream("var x = 0x765432536763762734623472346;"));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::VAR);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::VAR);
     BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
     BOOST_CHECK_EQUAL(scanner.next(), Token::ASSIGN);
     BOOST_CHECK_EQUAL(scanner.next(), Token::NUMBER);
@@ -96,8 +97,7 @@ BOOST_AUTO_TEST_CASE(hex_numbers)
 BOOST_AUTO_TEST_CASE(locations)
 {
     Scanner scanner(CharStream("function_identifier has ; -0x743/*comment*/\n ident //comment"));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::IDENTIFIER);
     BOOST_CHECK_EQUAL(scanner.getCurrentLocation().beg_pos, 0);
     BOOST_CHECK_EQUAL(scanner.getCurrentLocation().end_pos, 19);
     BOOST_CHECK_EQUAL(scanner.next(), Token::IDENTIFIER);
@@ -122,8 +122,7 @@ BOOST_AUTO_TEST_CASE(ambiguities)
 {
     // test scanning of some operators which need look-ahead
     Scanner scanner(CharStream("<=""<""+ +=a++ =>""<<"));
-    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::ILLEGAL);
-    BOOST_CHECK_EQUAL(scanner.next(), Token::LTE);
+    BOOST_CHECK_EQUAL(scanner.getCurrentToken(), Token::LTE);
     BOOST_CHECK_EQUAL(scanner.next(), Token::LT);
     BOOST_CHECK_EQUAL(scanner.next(), Token::ADD);
     BOOST_CHECK_EQUAL(scanner.next(), Token::ASSIGN_ADD);