Permalink
Browse files

update chemicl-user package and stop using asdf hack for finding data…

… files
  • Loading branch information...
1 parent 2337371 commit fda4f23775af5c150e7ae5986594e954c656bc35 @slyrus committed May 4, 2012
Showing with 9 additions and 12 deletions.
  1. +9 −12 scratch.lisp
View
@@ -1,8 +1,12 @@
-(asdf:oos 'asdf:load-op :chemicl)
+(asdf:load-system 'chemicl)
-(in-package :chemicl)
+(cl:defpackage #:chemicl-user
+ (:use #:cl #:chemicl)
+ (:shadowing-import-from #:chemicl #:atom))
+
+(cl:in-package #:chemicl-user)
(defun join-xpath-result (result)
(if (xpath:node-set-p result)
@@ -11,12 +15,8 @@
(xpath:string-value result)))
(defparameter *element-nodes*
- (cxml:parse-file
- (asdf:component-pathname
- (let ((path '("chemicl" "data" "elementdata.xml")))
- (reduce #'asdf:find-component (cdr path)
- :initial-value (asdf:find-system (car path)))))
- (stp:make-builder)))
+ (cxml:parse-file *element-data-xml-pathname*
+ (stp:make-builder)))
(join-xpath-result
(xpath:evaluate
@@ -234,10 +234,7 @@
(with-cml-namespace
(xpath:evaluate "/cml"
(cxml:parse-file
- (asdf:component-pathname
- (let ((path '("chemicl" "data" "isotopes.xml")))
- (reduce #'asdf:find-component (cdr path)
- :initial-value (asdf:find-system (car path)))))
+ *isotope-data-xml-pathname*
(stp:make-builder)))))
(with-cml-namespace

0 comments on commit fda4f23

Please sign in to comment.