OrgWiki/go-org-orgwiki
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Implement result blocks

Browse source
This commit is contained in:
Niklas Fasching 2020-04-16 17:28:49 +02:00
parent 232c27327c
commit f6f4646d45
8 changed files with 66 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
org/block.go
View file

@ -12,6 +12,10 @@ type Block struct {
Children []Node
}
type Result struct {
Node Node
}
type Example struct {
Children []Node
}
@ -19,6 +23,7 @@ type Example struct {
var exampleLineRegexp = regexp.MustCompile(`^(\s*):(\s(.*)|\s*$)`)
var beginBlockRegexp = regexp.MustCompile(`(?i)^(\s*)#\+BEGIN_(\w+)(.*)`)
var endBlockRegexp = regexp.MustCompile(`(?i)^(\s*)#\+END_(\w+)`)
var resultRegexp = regexp.MustCompile(`(?i)^(\s*)#\+RESULTS:`)
var exampleBlockEscapeRegexp = regexp.MustCompile(`(^|\n)([ \t]*),([ \t]*)(\*|,\*|#\+|,#\+)`)
func lexBlock(line string) (token, bool) {
@ -30,6 +35,13 @@ func lexBlock(line string) (token, bool) {
return nilToken, false
}
func lexResult(line string) (token, bool) {
if m := resultRegexp.FindStringSubmatch(line); m != nil {
return token{"result", len(m[1]), "", m}, true
}
return nilToken, false
}
func lexExample(line string) (token, bool) {
if m := exampleLineRegexp.FindStringSubmatch(line); m != nil {
return token{"example", len(m[1]), m[3], m}, true
@ -75,6 +87,11 @@ func (d *Document) parseExample(i int, parentStop stopFn) (int, Node) {
return i - start, example
}
func (d *Document) parseResult(i int, parentStop stopFn) (int, Node) {
consumed, node := d.parseOne(i+1, parentStop)
return consumed + 1, Result{node}
}
func trimIndentUpTo(max int) func(string) string {
return func(line string) string {
i := 0
@ -86,3 +103,4 @@ func trimIndentUpTo(max int) func(string) string {
func (n Example) String() string { return orgWriter.WriteNodesAsString(n) }
func (n Block) String() string { return orgWriter.WriteNodesAsString(n) }
func (n Result) String() string { return orgWriter.WriteNodesAsString(n) }