Binary format and many optimisations

[goredo.git] / dot.go

diff --git a/dot.go b/dot.go
index 8f5673108de3450848bdfad3370ed26958a1488b..a77ec69197fda3e1b2c07daf950de2a542f73d8c 100644 (file)
--- a/dot.go
+++ b/dot.go
@@ -20,13 +20,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 package main
 
 import (
-       "errors"
        "fmt"
-       "io"
        "os"
        "path"
-
-       "go.cypherpunks.ru/recfile"
 )
 
 type DotNodes struct {
@@ -34,37 +30,43 @@ type DotNodes struct {
        to   string
 }
 
-func dotWalker(data map[DotNodes]bool, tgtOrig string) (map[DotNodes]bool, error) {
-       cwd, tgt := cwdAndTgt(tgtOrig)
-       depPath := path.Join(cwd, RedoDir, tgt+DepSuffix)
-       fdDep, err := os.Open(depPath)
+func dotWalker(data map[DotNodes]bool, tgt *Tgt) (map[DotNodes]bool, error) {
+       raw, err := os.ReadFile(tgt.dep)
+       if err != nil {
+               return nil, ErrLine(err)
+       }
+       _, raw, err = depHeadParse(raw)
        if err != nil {
-               return nil, err
+               return nil, ErrLine(err)
        }
-       defer fdDep.Close()
-       var dep string
-       r := recfile.NewReader(fdDep)
-       for {
-               m, err := r.NextMap()
+       var typ byte
+       var name string
+       var dep *Tgt
+       var chunk []byte
+       tgtH, _ := pathSplit(tgt.a)
+       for len(raw) > 0 {
+               typ, chunk, raw, err = chunkRead(raw)
                if err != nil {
-                       if errors.Is(err, io.EOF) {
-                               break
-                       }
-                       return nil, err
+                       return nil, ErrLine(err)
                }
-               switch m["Type"] {
+               switch typ {
                case DepTypeIfcreate:
-                       data[DotNodes{tgtOrig, cwdMustRel(cwd, m["Target"])}] = true
-               case DepTypeIfchange:
-                       dep = m["Target"]
-                       if dep == tgt {
+                       data[DotNodes{tgt.rel, NewTgt(path.Join(tgtH, string(chunk))).rel}] = true
+               case DepTypeIfchange, DepTypeIfchangeDummy:
+                       if typ == DepTypeIfchangeDummy {
+                               name = string(chunk)
+                       } else {
+                               name = string(chunk[InodeLen+HashLen:])
+                       }
+                       dep = NewTgt(path.Join(tgtH, name))
+                       if dep.a == tgt.a {
                                continue
                        }
-                       data[DotNodes{tgtOrig, cwdMustRel(cwd, dep)}] = false
-                       if isSrc(cwd, dep) {
+                       data[DotNodes{tgt.rel, dep.rel}] = false
+                       if isSrc(dep) {
                                continue
                        }
-                       data, err = dotWalker(data, cwdMustRel(cwd, dep))
+                       data, err = dotWalker(data, dep)
                        if err != nil {
                                return nil, err
                        }
@@ -73,7 +75,7 @@ func dotWalker(data map[DotNodes]bool, tgtOrig string) (map[DotNodes]bool, error
        return data, nil
 }
 
-func dotPrint(tgts []string) error {
+func dotPrint(tgts []*Tgt) error {
        data := map[DotNodes]bool{}
        var err error
        for _, tgt := range tgts {