Merge branch 'master' of git://factorcode.org/git/factor

db4
Doug Coleman 2009-02-15 09:14:33 -06:00
commit f4a242f341
2 changed files with 3 additions and 3 deletions
basis
compiler/cfg/builder

View File

@ -55,7 +55,7 @@ GENERIC: emit-node ( node -- next )
: begin-word ( -- )
#! We store the basic block after the prologue as a loop
#! labelled by the current word, so that self-recursive
#! labeled by the current word, so that self-recursive
#! calls can skip an epilogue/prologue.
##prologue
##branch

View File

@ -85,10 +85,10 @@ image-link = "[[image:" link-content "|" link-content "]]"
simple-link = "[[" link-content "]]"
=> [[ second >string dup simple-link-title link boa ]]
labelled-link = "[[" link-content "|" link-content "]]"
labeled-link = "[[" link-content "|" link-content "]]"
=> [[ [ second >string ] [ fourth >string ] bi link boa ]]
link = image-link | labelled-link | simple-link
link = image-link | labeled-link | simple-link
escaped-char = "\" .
=> [[ second 1string ]]