Changeset 30159 for lang/elisp

Timestamp:

02/16/09 23:40:08 (4 years ago)

Author:

imakado

Message:

クオートされているyamlを読み込めるようにした

Files:

• lang/elisp/pit/branches/fix-regexp/pit.el (modified) (4 diffs)

lang/elisp/pit/branches/fix-regexp/pit.el

@@ -69 +69 @@
 (defalias 'alist/update 'alist/merge)
 
+(defvar pit/profile-regexp
+  (rx bol
+      (? (or "\"" "'"))
+      "profile"
+      (? (or "\"" "'"))
+      ":"
+      (* space)
+      (? (or "\"" "'"))
+      (group
+       (+ (not (any "'" "\""))))))
+
 (defun pit/profile ()
   (when (file-exists-p pit/config)
@@ -74 +85 @@
             (with-temp-buffer
               (insert-file-contents pit/config)
-              (when (re-search-forward "^profile:[ ]*\\(.+\\)" nil t)
+              (when (re-search-forward pit/profile-regexp nil t)
                 (match-string 1))))
            (profile/file
@@ -181 +192 @@
                 '((" +$" "")
                   ("---" "(setq result '(")
-                  ("^\\([^ ].+\\):" "(\\1 (")
-                  ("^[ ]+\\(.+\\):[ ]+?\\(.+\\)" "(\\1 . \"\\2\")")
+                  ("\\(?:^\\(?:[\"']\\)?\\([^'\": ]+\\)['\"]?:\\)" "(\\1 (")
+                  ("\\(?:^ +\\(?:[\"']\\)?\\([^'\"\n]+\\)\\(?:[\"']\\)?:\\(?: +\\)?\\(?:[\"']\\)?\\([^'\"\n]+\\).*\\)"
+                   "(\\1 . \"\\2\")")
                   ("\\()\\)\n\\(^[^'].+(\\)" "))\\1\n\\2")))
           (goto-char (point-max))
@@ -190 +202 @@
       result)))
 
+;;; Test
+(defvar pit/test-profile-yaml
+  "---
+profile: default")
+
+(defvar pit/test-profile-yaml-quoted
+  "---
+\"profile\": 'default'")
+
+
+(dont-compile
+  (when (fboundp 'expectations)
+    (expectations
+      (desc "pit/load")
+      (expect "default"
+        (with-temp-buffer
+          (insert pit/test-profile-yaml)
+          (goto-char (point-min))
+          (when (re-search-forward pit/profile-regexp nil t)
+            (match-string 1))))
+
+      (expect "default"
+        (with-temp-buffer
+          (insert pit/test-profile-yaml-quoted)
+          (goto-char (point-min))
+          (when (re-search-forward pit/profile-regexp nil t)
+            (match-string 1))))
+      )))
+
+
 (provide 'pit)