Merge pull request #2 from bdunahu/bdunahu

Finish parser, add .text and .data directives, variable names, label processing

1 files changed, 16 insertions, 15 deletions

diff --git a/src/package.lisp b/src/package.lisp
index 3364856..bbb45a3 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -1,4 +1,4 @@
-helper(defpackage #:rva
+(defpackage #:rva
   (:use #:cl)
   (:export #:main))
 
@@ -6,21 +6,22 @@ helper(defpackage #:rva
   (:use #:cl)
   (:export #:asm-extension?
            #:format-as-binary
-           #:type-r
-           #:type-i
-           #:type-j
-           #:label-loc))
+	   #:insert-in-middle
+	   #:iota
+	   #:riffle
+	   #:add-variable
+	   #:add-label
+	   #:get-variable
+	   #:get-label
+	   #:r-type
+	   #:i-type
+	   #:j-type))
 
-(defpackage #:lex
+(defpackage #:parse
   (:use #:cl)
-  (:export #:lexer-error
-           #:file->tokens
-           ;; exported for testing only
-           #:read-token))
+  (:export #:str->ast
+	   #:line-number))
 
-(defpackage #:parse
+(defpackage #:emit
   (:use #:cl)
-  (:export #:parser-error
-           #:tokens->ast
-           ;; exported for testing only
-           #:extract-label))
+  (:export #:emit))