[isidorus-cvs] r295 - branches/new-datamodel/src branches/new-datamodel/src/json branches/new-datamodel/src/model trunk/src

[Lukas Giessmann]

Author: lgiessmann
Date: Tue May 25 14:10:18 2010
New Revision: 295

Log:
fixed a problem with sbcl/asdf and the sb-impl::*default-external-format* --> now it is set to :utf-8 during the loading process and then set to its old value

Modified:
   branches/new-datamodel/src/isidorus.asd
   branches/new-datamodel/src/json/json_importer.lisp
   branches/new-datamodel/src/model/changes.lisp
   trunk/src/isidorus.asd

Modified: branches/new-datamodel/src/isidorus.asd
==============================================================================
--- branches/new-datamodel/src/isidorus.asd	(original)
+++ branches/new-datamodel/src/isidorus.asd	Tue May 25 14:10:18 2010
@@ -12,6 +12,9 @@
   (:use :asdf :cl))
 (in-package :isidorus-system)
 
+(defvar *old-external-format* sb-impl::*default-external-format*)
+(setf sb-impl::*default-external-format* :UTF-8)
+
 (asdf:defsystem "isidorus"
   :description "The future ingenious, self-evaluating Lisp TM engine"
   :version "0.1"
@@ -202,6 +205,9 @@
                :uuid
 	       :cl-json))
 
+(setf sb-impl::*default-external-format* *old-external-format*)
+
+
 ;;
 ;; For the package pathnames, create a link from  ~/.sbcl/systems
 ;; to the file pathnames.asd in Seibel's pathname-library.

Modified: branches/new-datamodel/src/json/json_importer.lisp
==============================================================================
--- branches/new-datamodel/src/json/json_importer.lisp	(original)
+++ branches/new-datamodel/src/json/json_importer.lisp	Tue May 25 14:10:18 2010
@@ -244,12 +244,10 @@
 	   (json-to-scope (getf json-decoded-list :scopes)))
 	  (instance-of
 	   (psis-to-topic (getf json-decoded-list :type))))
-      (declare (list json-decoded-list))
-      (declare (TopicC top))
-  
+      ;(declare (list json-decoded-list)) causes problems with sbcl 1.0.34.0.debian
+      ;(declare (TopicC top))
       (unless namevalue
         (error "A name must have exactly one namevalue"))
-
       (let ((name (make-construct 'NameC 
 				  :start-revision start-revision
 				  :topic top

Modified: branches/new-datamodel/src/model/changes.lisp
==============================================================================
--- branches/new-datamodel/src/model/changes.lisp	(original)
+++ branches/new-datamodel/src/model/changes.lisp	Tue May 25 14:10:18 2010
@@ -140,7 +140,7 @@
     * (for topics) modified through the addition or removal of an association in which it is first player"))
 
 (defmethod changed-p ((construct TopicMapConstructC) (revision integer))
-  "The 'normal' case: changes only when new identifiers are added" 
+  "The 'normal' case: changes only when new identifiers are added"
   (find revision (versions construct) :test #'= :key #'start-revision))
 
 ;There is quite deliberately no method specialized on AssociationC as

Modified: trunk/src/isidorus.asd
==============================================================================
--- trunk/src/isidorus.asd	(original)
+++ trunk/src/isidorus.asd	Tue May 25 14:10:18 2010
@@ -12,6 +12,9 @@
   (:use :asdf :cl))
 (in-package :isidorus-system)
 
+(defvar *old-external-format* sb-impl::*default-external-format*)
+(setf sb-impl::*default-external-format* :UTF-8)
+
 (asdf:defsystem "isidorus"
   :description "The future ingenious, self-evaluating Lisp TM engine"
   :version "0.1"
@@ -201,6 +204,9 @@
                :uuid
 	       :cl-json))
 
+
+(setf sb-impl::*default-external-format* *old-external-format*)
+
 ;;
 ;; For the package pathnames, create a link from  ~/.sbcl/systems
 ;; to the file pathnames.asd in Seibel's pathname-library.