Changeset 15746 for lang/gauche

Timestamp:

07/13/08 18:54:44 (4 months ago)

Author:

kiyoka

Message:

Supported parsing with no timeline of a wiki content.

Location:

lang/gauche/oldtype/trunk

Files:

• Kahua/oldtype/oldtype/page.scm (modified) (1 diff)
• Kahua/oldtype/oldtype/timeline.scm (modified) (1 diff)
• Kahua/oldtype/oldtype/version.kahua (modified) (1 diff)
• config.sh (modified) (2 diffs)
• src/Makefile (modified) (1 diff)
• src/Test.no-timeline.sexp.master (added)
• src/oldtype_to (modified) (1 diff)
• src/test.scm (modified) (4 diffs)

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/page.scm

@@ -82 +82 @@
 
 
+;; Parsing wiki format
+;;
+;;   In case of log-file or ann-file is #f, this function takes only parse action.
+;;
 (define-method parse ((self <oldtype-page>) wiki-port log-file ann-file)
   (let1 timeline (make <oldtype-timeline> :name (name-of self))
         (set! (timeline-of self)
-              (parse timeline log-file ann-file)))
+              (if (and log-file ann-file)
+                  (parse timeline log-file ann-file)
+                  timeline)))
   (set! (sxml-of self)
         (oldtype:sxml->internal

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/timeline.scm

@@ -70 +70 @@
    ;; vector of <oldtype-log> in page
    (annotation    :accessor annotation-of    :init-keyword :annotation
-                  :init-value '())
+                  :init-value '#())
    ;; vector of text in page
    (text          :accessor text-of          :init-keyword :text
-                  :init-value '())
+                  :init-value '#())
    ;; distribution of revision
    (distribution  :accessor distribution-of  :init-keyword :distribution

lang/gauche/oldtype/trunk/Kahua/oldtype/oldtype/version.kahua

@@ -7 +7 @@
 
 ;;---------------------------------------------------------
-(define *oldtype-version* "0.3.0")
+(define *oldtype-version* "0.3.1")

lang/gauche/oldtype/trunk/config.sh

@@ -2 +2 @@
 
 # variables
-export OT_MASTER=nil  # t or nil
+export OT_MASTER=t  # t or nil
 
 export OT_SITE=/home/kiyoka/work/site-unstable
@@ -8 +8 @@
 export OT_PASS_BACKEND=${OT_PASSWORD}
 export OT_USER_LOCAL="kiyoka"
-export OT_SVNURL=http://genkan.sumibi.org/svn/oldtype
+export OT_SVNURL=http://genkan.sumibi.org/svn/newtype

lang/gauche/oldtype/trunk/src/Makefile

@@ -5 +5 @@
 all: log.txt  Test.ann.txt  Entry1.ann.txt  Entry2.ann.txt
         gosh -I ../Kahua/oldtype ./oldtype_to internal  ../edit/Test.ot    log.txt Test.ann.txt    > Test.sexp
+        gosh -I ../Kahua/oldtype ./oldtype_to internal  ../edit/Test.ot                            > Test.no-timeline.sexp
         gosh -I ../Kahua/oldtype ./oldtype_to internal  ../edit/Entry1.ot  log.txt Entry1.ann.txt  > Entry1.sexp
         gosh -I ../Kahua/oldtype ./oldtype_to internal  ../edit/Entry2.ot  log.txt Entry2.ann.txt  > Entry2.sexp

lang/gauche/oldtype/trunk/src/oldtype_to

@@ -145 +145 @@
     (case type
       ('internal
-       (when (< 1 (length rest))
-         (let1 oldtype-page   (parse (make <oldtype-page> :name wikiname) input-port (car rest) (cadr rest))
-               (pretty-print-sexp (serialize oldtype-page)))))
+       (if (< 1 (length rest))
+           (let1 oldtype-page   (parse (make <oldtype-page> :name wikiname) input-port (car rest) (cadr rest))
+                 (pretty-print-sexp (serialize oldtype-page)))
+           (let1 oldtype-page   (parse (make <oldtype-page> :name wikiname) input-port #f #f)
+                 (pretty-print-sexp (serialize oldtype-page)))))
       ('sxml
        (let1 sxml (oldtype-parse input-port)

lang/gauche/oldtype/trunk/src/test.scm

@@ -36 +36 @@
           (open-input-string converted-str)))
     (let ((oldtype-page #f)
+          (oldtype-page-no-timeline #f)
           (oldtype-timeline #f)
-          (loaded        (with-input-from-file "Test.sexp.master"
-                           (lambda ()
-                             (read)))))
-
+          (loaded
+           (with-input-from-file "Test.sexp.master"
+             (lambda ()
+               (read))))
+          (loaded-no-timeline
+           (with-input-from-file "Test.no-timeline.sexp.master"
+             (lambda ()
+               (read)))))
       (test-start "serialize,deserialize")
 
@@ -54 +59 @@
 
       (test-section "oldtype-page")
-      (set! oldtype-page (parse (make <oldtype-page> :name "Test") input-port log-file ann-file))
+      (set! oldtype-page
+            (parse (make <oldtype-page> :name "Test") input-port log-file ann-file))
+      (port-seek input-port 0)
+      (set! oldtype-page-no-timeline
+            (parse (make <oldtype-page> :name "Test") input-port #f #f))
+
       (let1 serialized     (serialize oldtype-page)
-            (test "serialized == DATA        "
+            (test "serialized == DATA (1)  "
                   loaded
                   (lambda () (serialize oldtype-page)))
-
+            
             (test "serialized == deserialized" serialized (lambda () 
                                                             (serialize
                                                              (deserialize
                                                               (make <oldtype-page>)
-                                                              serialized)))))
+                                                              serialized))))
+            (test "serialized == DATA (2)  "
+                  loaded-no-timeline
+                  (lambda () (serialize oldtype-page-no-timeline))))
       (test-end)
 
@@ -187 +200 @@
                   "M"
                   (lambda ()
-                    (sys-system (format "echo 'a' >> ~a/~a/~a" (get-fullpath work) "edit" "_kiyoka.ot"))
-                    (car (status work "_kiyoka"))))
-
+                    (sys-system (format "echo 'a' >> ~a/~a/~a" (get-fullpath work) "edit" "test.ot"))
+                    (car (status work "test"))))
+            
             (when
                 #f
@@ -196 +209 @@
                     (lambda ()
                       (commit work)))))
-
+      
       (test-end)