Inline source block and test fixes * lisp/ob.el: Fixed late night refactoring error...
authorMartyn Jago <martyn.jago@btinternet.com>
Tue, 6 Sep 2011 08:00:24 +0000 (09:00 +0100)
committerEric Schulte <schulte.eric@gmail.com>
Tue, 6 Sep 2011 14:53:07 +0000 (08:53 -0600)
lisp/ob.el
testing/examples/babel.org
testing/lisp/test-ob.el

index 2964f82..d6b0ba3 100644 (file)
@@ -166,11 +166,11 @@ Returns non-nil if match-data set"
                      (beginning-of-line 1)
                      (string= "src" (thing-at-point 'word))))
        (first-line-p (= 1 (line-number-at-pos)))
-      (orig (point)))
-    (let ((search-for (cond (src-at-0-p "src_")
-                           (first-line-p " src_")
+       (orig (point)))
+    (let ((search-for (cond ((and src-at-0-p first-line-p  "src_"))
+                           (first-line-p "[ \t]src_")
                            (t "[ \f\t\n\r\v]src_")))
-         (lower-limit (if (= 1 (line-number-at-pos))
+         (lower-limit (if first-line-p
                           nil
                         (- (point-at-bol) 1))))
       (save-excursion
index f85e1f0..5b7f2ef 100644 (file)
@@ -279,6 +279,7 @@ this is simple
    :ID:       d4faa7b3-072b-4dcf-813c-dd7141c633f3
    :END:
 has length 14
+
 * org-babel-get-inline-src-block-matches
   :PROPERTIES:  
   :results:  silent
index 71ea7e2..f9884dd 100644 (file)
 
 
 (ert-deftest test-org-babel/inline-src-block-regexp ()
-  (should(equal (concat "[^-[:alnum:]]\\(src_\\([^ \f\t\n\r\v]+\\)"
+  (should(equal (concat "\\(?:^\\|[^-[:alnum:]]\\)\\(src_\\([^ \f\t\n\r\v]+\\)"
                        "\\(\\|\\[\\(.*?\\)\\]\\)"
                        "{\\([^\f\n\r\v]+?\\)}\\)")
                org-babel-inline-src-block-regexp))
       (should(equal '(:result-type . output) (assoc :result-type params)))
       (should(equal '(num . 9) (cdr (assoc :var params)))))))
 
-(ert-deftest test-org-babel/parse-header-args ()
+(ert-deftest test-org-babel/parse-header-args2 ()
   (org-test-at-id "2409e8ba-7b5f-4678-8888-e48aa02d8cb4"
     (should (string-match (regexp-quote "this is simple")
                          (org-babel-ref-resolve "simple-subtree")))
 
 (ert-deftest test-org-babel/org-babel-get-inline-src-block-matches ()
   (org-test-at-id "0D0983D4-DE33-400A-8A05-A225A567BC74"
-    (should (fboundp 'org-babel-get-inline-src-block-matches))
-    (should (re-search-forward "src_" nil t)) ;; 1
-    (should (= 6132 (match-end 0)))
-    (should (org-babel-get-inline-src-block-matches))
-    (should (re-search-forward "}" nil (point-at-bol))) ;; 1
-    (should-not (org-babel-get-inline-src-block-matches))
-    (should (re-search-forward "in" nil t)) ;; 2
-    (should-not (org-babel-get-inline-src-block-matches))
-    (should (re-search-forward "echo" nil t)) ;; 2
-    (should (org-babel-get-inline-src-block-matches))
-    (should (re-search-forward "blocks" nil t)) ;; 3
-    (left-char 8) ;; 3
-    (should (org-babel-get-inline-src-block-matches))
-    (right-char 1) ;;3
-    (should-not (org-babel-get-inline-src-block-matches))
-    (should (re-search-forward ":results" nil t)) ;; 4
-    (should (org-babel-get-inline-src-block-matches))
-    (end-of-line)
-    (should-not (org-babel-get-inline-src-block-matches))
-    ))
+    (let ((test-point (point)))
+      (should (fboundp 'org-babel-get-inline-src-block-matches))
+      (should (re-search-forward "src_" nil t)) ;; 1
+      (should (= (+ test-point 140) (match-end 0)))
+      (should (org-babel-get-inline-src-block-matches))
+      (should (re-search-forward "}" nil (point-at-bol))) ;; 1
+      (should-not (org-babel-get-inline-src-block-matches))
+      (should (re-search-forward "in" nil t)) ;; 2
+      (should-not (org-babel-get-inline-src-block-matches))
+      (should (re-search-forward "echo" nil t)) ;; 2
+      (should (org-babel-get-inline-src-block-matches))
+      (should (re-search-forward "blocks" nil t)) ;; 3
+      (left-char 8) ;; 3
+      (should (org-babel-get-inline-src-block-matches))
+      (right-char 1) ;;3
+      (should-not (org-babel-get-inline-src-block-matches))
+      (should (re-search-forward ":results" nil t)) ;; 4
+      (should (org-babel-get-inline-src-block-matches))
+      (end-of-line)
+      (should-not (org-babel-get-inline-src-block-matches))
+    )))
 
 (provide 'test-ob)