diff --git a/MANIFEST b/MANIFEST deleted file mode 100644 index 539a5c7..0000000 --- a/MANIFEST +++ /dev/null @@ -1,21 +0,0 @@ -recognize -setup.py -data/test.dico -finenight/__init__.py -finenight/error.py -finenight/et.py -finenight/foo.py -finenight/fsa.py -finenight/fsaTest.py -finenight/fsaTest2.py -finenight/fsc.py -finenight/fscTest.py -finenight/fst.py -finenight/fstTest.py -finenight/iadfa.py -finenight/nameGenerator.py -finenight/possibleStates.py -finenight/setup.py -finenight/state.py -finenight/test.py -finenight/transition.py diff --git a/MANIFEST.in b/MANIFEST.in new file mode 100644 index 0000000..acbde80 --- /dev/null +++ b/MANIFEST.in @@ -0,0 +1,3 @@ +;recursive-include data/ * +setup.py +recursive-include finenight/src * diff --git a/finenight/lisp/fsa.lisp b/finenight/lisp/fsa.lisp index ec25d10..bb855ed 100644 --- a/finenight/lisp/fsa.lisp +++ b/finenight/lisp/fsa.lisp @@ -4,7 +4,7 @@ ;; the node consists of a label and a map a symbol to ;; a destination object. -(defstruct (node (:copier nil)) +(defstruct (hash-node (:copier nil)) label (symbols-map (make-hash-table :test 'equal)) (final nil)) diff --git a/finenight/lisp/iadfa-run.lisp b/finenight/lisp/iadfa-run.lisp index 1086a4c..9f8ecc8 100644 --- a/finenight/lisp/iadfa-run.lisp +++ b/finenight/lisp/iadfa-run.lisp @@ -11,7 +11,7 @@ ;(dolist (word (extract-words fsa)) ;(format str "~A~%" word))))) - +(iadfa-run) ;(do-symbols (s (find-package :com.rrette.finenight.iadfa)) ;(sb-ext:save-lisp-and-die "iadfa-run" :executable t :toplevel #'iadfa-run) diff --git a/finenight/python/__init__.py b/finenight/python/__init__.py index 49e4c5c..daf39a5 100644 --- a/finenight/python/__init__.py +++ b/finenight/python/__init__.py @@ -1 +1 @@ -__all__ = ["error", "fsa", "et", "fsc", "fst", "iadfa", "state", "transition"] +#__all__ = ["error", "fsa", "et", "fsc", "fst", "iadfa", "state", "transition"] diff --git a/setup.py b/setup.py index 8f4edc7..a39e314 100644 --- a/setup.py +++ b/setup.py @@ -9,5 +9,6 @@ author_email='jpb_NO_SPAM@rrette.com', url='http://rrette.com/moman.html', packages=['finenight'], - scripts=['recognize'] + package_dir={'finenight': 'finenight/python/'}, + scripts=['finenight/python/recognize'] )