[cl-net-snmp-cvs] r44 - in trunk: . asn.1

[ctian at common-lisp.net]

Author: ctian
Date: Mon Sep 17 14:16:05 2007
New Revision: 44

Modified:
   trunk/asn.1/asn.1.zb
   trunk/asn.1/mib.lisp
   trunk/asn.1/stream-test.lisp
   trunk/net-snmp.asd
Log:
Add zb asdf support

Modified: trunk/asn.1/asn.1.zb
==============================================================================
--- trunk/asn.1/asn.1.zb	(original)
+++ trunk/asn.1/asn.1.zb	Mon Sep 17 14:16:05 2007
@@ -24,7 +24,6 @@
 Value-Assignment := kb-domain: [(name) (type) (value)];
 Object-Type-Assignment :=
 	Value-Assignment: [(syntax) (max-access) (status) (description) (index)];
-Type := kb-domain: [];
 Object-Identifier-Value := kb-domain: [(value)];
 
 ;; Rule Definitions
@@ -99,6 +98,7 @@
                                                (syntax Type)
                                                (max-access Object-Type-Access)
                                                (status Object-Type-Status)
+                                               (description String)
                                                (index Object-Type-Index)
                                                (value Object-Identifier-Value)] }
 

Modified: trunk/asn.1/mib.lisp
==============================================================================
--- trunk/asn.1/mib.lisp	(original)
+++ trunk/asn.1/mib.lisp	Mon Sep 17 14:16:05 2007
@@ -67,6 +67,7 @@
 
 (defun parse-mib (file &key (verbose nil))
   (let ((zb:*comment-start* "--")
-        (zb:*comment-brackets* '(("/*" . "*/"))))
+        (zb:*comment-brackets* '(("/*" . "*/")))
+        (zb:*preserve-case* t))
     (zb:file-parser file :grammar (zb:find-grammar "ASN.1") :verbose verbose)))
 

Modified: trunk/asn.1/stream-test.lisp
==============================================================================
--- trunk/asn.1/stream-test.lisp	(original)
+++ trunk/asn.1/stream-test.lisp	Mon Sep 17 14:16:05 2007
@@ -34,7 +34,9 @@
         (fresh-line)))))
 
 (defun load-syntax (&optional (def *asn.1-def*) (syntax *asn.1-syntax*))
-  (zb:zebu-compile-file def :output-file syntax)
+  (let ((zb:*warn-conflicts* t)
+        (zb:*allow-conflicts* t))
+    (zb:zebu-compile-file def :output-file syntax))
   (zb:zebu-load-file syntax))
 
 (defun test-syntax (name)

Modified: trunk/net-snmp.asd
==============================================================================
--- trunk/net-snmp.asd	(original)
+++ trunk/net-snmp.asd	Mon Sep 17 14:16:05 2007
@@ -18,7 +18,9 @@
                                            (:file "ber" :depends-on ("package"))
                                            (:file "oid" :depends-on ("ber"))
                                            (:file "mib" :depends-on ("oid"))
-					   (:file "mib-parse" :depends-on ("mib"))))
+                                           (:zebu-source-file "asn.1")
+					   (:file "mib-parse"
+                                            :depends-on ("mib" "asn.1"))))
                (:file "package")
                (:file "constants" :depends-on ("package"))
 	       (:file "typedefs" :depends-on ("constants"))