README.md

@@ -1,3 +1,3 @@
-# arguile
+# argyle
 
-Arc + Guile
+Arc + Guile

arguile.scm

@@ -1,33 +0,0 @@
-(module (arguile)
-  :duplicates (last))
-(use (arguile base)
-     (arguile match)
-     (arguile data)
-     (arguile data tbl)
-     (arguile data vec)
-     (arguile data q)
-     (arguile generic)
-     (arguile loop)
-     (arguile nested-loop)
-     (arguile conc)
-     (arguile reader)
-     
-     (ice-9 match)
-     (ice-9 receive)
-     (srfi srfi-45))
-
-(re-export-modules
- (arguile base)
- (arguile match)
- (arguile data)
- (arguile data tbl)
- (arguile data vec)
- (arguile data q)
- (arguile generic)
- (arguile loop)
- (arguile nested-loop)
- (arguile conc)
- 
- (ice-9 match)
- (ice-9 receive)
- (srfi srfi-45))

arguile/base.scm

@@ -1,18 +0,0 @@
-(module (arguile base))
-(use (arguile base mac)
-     (arguile base fn)
-     (arguile base ctrl)
-     (arguile base type)
-     (arguile base generic)
-     (arguile base err)
-     (arguile base io)
-     (arguile base module))
-
-(re-export-modules (arguile base mac)
-                   (arguile base fn)
-                   (arguile base ctrl)
-                   (arguile base type)
-                   (arguile base generic)
-                   (arguile base err)
-                   (arguile base io)
-                   (arguile base module))

arguile/tests/tssyntax.scm

@@ -1,11 +0,0 @@
-(module (arguile tests tssyntax))
-(use (arguile ssyntax)
-     (arguile core))
-
-(mac test0
-  ((a) #'#t))
-
-(mac test1 x
-  ((a)
-   (with-syntax ((t (datum->syntax x 't)))
-     #'(let t #t t))))

argyle.scm

@@ -0,0 +1,34 @@
+(ns (argyle)
+    :duplicates (last))
+
+(use (argyle base)
+     (argyle match)
+     (argyle data)
+     (argyle data tbl)
+     (argyle data vec)
+     (argyle data q)
+     (argyle generic)
+     (argyle loop)
+     (argyle nested-loop)
+     (argyle conc)
+     (argyle reader)
+     
+     (ice-9 match)
+     (ice-9 receive)
+     (srfi srfi-45))
+
+(re-export-ns
+ (argyle base)
+ (argyle match)
+ (argyle data)
+ (argyle data tbl)
+ (argyle data vec)
+ (argyle data q)
+ (argyle generic)
+ (argyle loop)
+ (argyle nested-loop)
+ (argyle conc)
+ 
+ (ice-9 match)
+ (ice-9 receive)
+ (srfi srfi-45))

argyle/base.scm

@@ -0,0 +1,20 @@
+(ns (argyle base))
+(use (argyle base mac)
+     (argyle base fn)
+     (argyle base ctrl)
+     (argyle base type)
+     (argyle base generic)
+     (argyle base err)
+     (argyle base io)
+     (argyle base math)
+     (argyle base ns))
+
+(re-export-ns (argyle base mac)
+                   (argyle base fn)
+                   (argyle base ctrl)
+                   (argyle base type)
+                   (argyle base generic)
+                   (argyle base err)
+                   (argyle base io)
+                   (argyle base math)
+                   (argyle base ns))

arguile/base/ctrl.scm

@@ -1,9 +1,9 @@
-(module (arguile base ctrl)
+(ns (argyle base ctrl)
     :replace (do = aif it & $> nil?))
 (use ((srfi srfi-1) :select (append-map lset-difference))
-     (arguile guile)
-     (arguile base mac)
-     (arguile base fn)
+     (argyle guile)
+     (argyle base mac)
+     (argyle base fn)
      (ice-9 control))
 (re-export abort (call/cc . c/cc) (call/ec . c/ec))
 

arguile/base/err.scm

@@ -1,5 +1,5 @@
-(module (arguile base err))
-(use (arguile base fn))
+(ns (argyle base err))
+(use (argyle base fn))
 
 (defp err error)
 (defp syn-violation syntax-violation)

arguile/base/fn.scm

@@ -1,7 +1,7 @@
-(module (arguile base fn)
-    :replace (fn fn-case def defp let ret w/ \\ ->> inline comp id? defd? wrap))
-(use (arguile guile)
-     (arguile base mac)
+(ns (argyle base fn)
+    :replace (fn fns def defp let ret w/ \\ ->> inline comp id? defd? wrap))
+(use (argyle guile)
+     (argyle base mac)
      (ice-9 receive))
 
 (mac def x
@@ -21,7 +21,7 @@
      #`((#,@(expand-kwargs #'(arg ...) fn-exp) . rst)
         body ...))))
 
-(mac fn-case
+(mac fns
   ((f1 f2 ...)
    #`(case-lambda*
       #,@(map fn-xpnd #'(f1 f2 ...)))))