Merge branch 'refactoring'

nishimura · Jul 9, 2016 · fe8a97d · fe8a97d
2 parents f3ecb76 + 53aafc2
commit fe8a97d
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -19,8 +19,6 @@ use Laiz\Parsec;
 use function Laiz\Parsec\parse;
 use function Laiz\Parsec\str;
 
-Parsec\Char\load();
-
 $parser = str('abc');
 
 $ret = parse($parser, "Test", "abcdef");
@@ -45,9 +43,6 @@ use function Laiz\Parsec\char;
 use function Laiz\Parsec\str;
 use function Laiz\Parsec\eof;
 
-Parsec\Char\load();
-Parsec\Combinator\load();
-
 $alnum = satisfy(function($s){
     return ctype_alnum($s);
 });
@@ -105,9 +100,6 @@ use function Laiz\Parsec\parserReturn;
 use function Laiz\Parsec\sepEndBy;
 use function Laiz\Parsec\Show\show;
 
-Parsec\Char\load();
-Parsec\Combinator\load();
-
 class Attr
 {
     public $name;

diff --git a/composer.json b/composer.json
@@ -11,7 +11,12 @@
 
   "autoload": {
       "psr-4": { "Laiz\\Parsec\\": "src/" },
-      "files": [ "src/functions.php", "src/fast.php" ]
+      "files": [
+          "src/functions.php",
+          "src/fast.php",
+          "src/char.php",
+          "src/combinator.php"
+      ]
   },
   "autoload-dev": {
     "psr-4": { "Laiz\\Test\\Parsec\\": "test/" }

diff --git a/src/functions.php b/src/functions.php
@@ -402,19 +402,6 @@ function modifyState(...$args)
 }
 
 
-//============================================================
-// Function loader
-//============================================================
-namespace Laiz\Parsec\Char;
-function load(){
-    require_once __DIR__ . '/char.php';
-}
-
-namespace Laiz\Parsec\Combinator;
-function load(){
-    require_once __DIR__ . '/combinator.php';
-}
-
 //============================================================
 // Type Classes
 //============================================================

diff --git a/test/BugfixTest.php b/test/BugfixTest.php
@@ -13,9 +13,6 @@
 use function Laiz\Parsec\optional;
 
 
-Parsec\Char\load();
-Parsec\Combinator\load();
-
 class BugfixTest extends \PHPUnit_Framework_TestCase
 {
     public function testCombinatorBind()

diff --git a/test/ParserCombinatorTest.php b/test/ParserCombinatorTest.php
@@ -40,9 +40,6 @@
 use function Laiz\Func\Alternative\aor;
 use function Laiz\Func\Functor\fmap;
 
-Parsec\Char\load();
-Parsec\Combinator\load();
-
 class ParserCombinatorTest extends \PHPUnit_Framework_TestCase
 {
     public function testUnconsArray()

diff --git a/test/ParserStateTest.php b/test/ParserStateTest.php
@@ -17,8 +17,6 @@
 use function Laiz\Parsec\putState;
 use function Laiz\Parsec\modifyState;
 
-Parsec\Char\load();
-
 class ParserStateTest extends \PHPUnit_Framework_TestCase
 {
     public function testGetState()

diff --git a/test/ParserTest.php b/test/ParserTest.php
@@ -23,8 +23,6 @@
 use function Laiz\Func\Alternative\aor;
 use function Laiz\Func\Monoid\mappend;
 
-Parsec\Char\load();
-
 class ParserTest extends \PHPUnit_Framework_TestCase
 {
     public function testUnconsArray()

diff --git a/test/TextTest.php b/test/TextTest.php
@@ -9,8 +9,6 @@
 use function Laiz\Parsec\Show\show;
 use function Laiz\Func\Either\Right;
 
-Parsec\Char\load();
-
 class TextTest extends \PHPUnit_Framework_TestCase
 {
     public function testParserInFix()