diff options
| author | Ludovic Court`es | 2007-04-04 09:57:52 +0000 |
|---|---|---|
| committer | Ludovic Court`es | 2007-04-04 09:57:52 +0000 |
| commit | 1b45eb54528d019a96ea07eba4a1c2f7aeb5acd6 (patch) | |
| tree | 6ad6fd683f7b205a1475a2f60de935e94f79f24c | |
| parent | 0caac277ae2f94d43ae68334cfb11031aafb78b6 (diff) | |
| download | skribilo-1b45eb54528d019a96ea07eba4a1c2f7aeb5acd6.tar.gz skribilo-1b45eb54528d019a96ea07eba4a1c2f7aeb5acd6.tar.lz skribilo-1b45eb54528d019a96ea07eba4a1c2f7aeb5acd6.zip | |
`diff' package: Added basic source location support.
* src/guile/skribilo/package/diff.scm (deletion, insertion, replacement,
unchanged): Added a `:loc' parameter.
(make-diff-document): When creating new ASTs, keep the location of
AST2.
git-archimport-id: lcourtes@laas.fr--2006-libre/skribilo--devo--1.2--patch-43
| -rw-r--r-- | src/guile/skribilo/package/diff.scm | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/guile/skribilo/package/diff.scm b/src/guile/skribilo/package/diff.scm index f3f6cba..895606e 100644 --- a/src/guile/skribilo/package/diff.scm +++ b/src/guile/skribilo/package/diff.scm @@ -61,28 +61,32 @@ ;;; Markup. ;;; -(define-markup (deletion :rest args) +(define-markup (deletion :rest args :key loc) (new markup (markup 'diff:deletion) (ident (gensym "diff:deletion")) + (loc (or loc &invocation-location)) (body args))) -(define-markup (insertion :rest args) +(define-markup (insertion :rest args :key loc) (new markup (markup 'diff:insertion) (ident (gensym "diff:insertion")) + (loc (or loc &invocation-location)) (body args))) -(define-markup (replacement :rest args) +(define-markup (replacement :rest args :key loc) (new markup (markup 'diff:replacement) (ident (gensym "diff:replacement")) + (loc (or loc &invocation-location)) (body args))) -(define-markup (unchanged :rest args) +(define-markup (unchanged :rest args :key loc) (new markup (markup 'diff:unchanged) (ident (gensym "diff:unchanged")) + (loc (or loc &invocation-location)) (body args))) @@ -282,6 +286,7 @@ (markup 'document) (ident ident) (class class) + (loc (ast-loc ast2)) (options opts) (body (loop (if (markup? ast1) (markup-body ast1) @@ -303,6 +308,7 @@ (markup kind) (ident ident) (class class) + (loc (ast-loc ast2)) (options (if (or (undiffable? kind) (not (container? ast1))) (markup-options ast2) @@ -324,6 +330,7 @@ (markup kind) (ident ident) (class class) + (loc (ast-loc ast2)) (options (if (or (undiffable? kind) (not (markup? ast1))) (markup-options ast2) @@ -338,6 +345,7 @@ ((command? ast2) ;; Leave it untouched. (new command + (loc (ast-loc ast2)) (fmt (command-fmt ast2)) (body (command-body ast2)))) @@ -358,10 +366,10 @@ ast2))) ((equal? ast1 ast2) - (unchanged ast1)) + (unchanged :loc (ast-loc ast2) ast1)) (else - (insertion ast2))))) + (insertion :loc (ast-loc ast2) ast2))))) |