From a4d81518d688879d230676e2638fd8c7f2e2314d Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Thu, 28 May 2015 19:10:16 +0900
Subject: [PATCH] Cleanup

---
 database.go |  8 ++++----
 node.go     |  6 +++---
 version.go  | 14 +++++++-------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/database.go b/database.go
index 07d395e..f8f0559 100644
--- a/database.go
+++ b/database.go
@@ -81,7 +81,7 @@ func (this *database) buildVersions(base string) ([]*version, error) {
 		return nil, err
 	}
 
-	var parent *version
+	var prev *version
 	var vers []*version
 
 	for _, node := range nodes {
@@ -94,17 +94,17 @@ func (this *database) buildVersions(base string) ([]*version, error) {
 			return nil, err
 		}
 
-		ver, err := newVersion(path.Join(base, node.Name()), timestamp, parent)
+		ver, err := newVersion(path.Join(base, node.Name()), timestamp, prev)
 		if err != nil {
 			return nil, err
 		}
 
 		vers = append(vers, ver)
-		parent = ver
+		prev = ver
 	}
 
 	for _, ver := range vers {
-		ver.terminus = vers[len(vers)-1]
+		ver.last = vers[len(vers)-1]
 	}
 
 	return vers, nil
diff --git a/node.go b/node.go
index 557cd35..aaa6d9e 100644
--- a/node.go
+++ b/node.go
@@ -37,7 +37,7 @@ type versionedNode struct {
 	path   string
 	info   os.FileInfo
 	parent *versionedNode
-	shadow *versionedNode
+	prev   *versionedNode
 	ver    *version
 }
 
@@ -114,11 +114,11 @@ func (this *versionedNode) rebasedPath() string {
 }
 
 func (this *versionedNode) rebasedTermPath() string {
-	if this.ver.terminus == nil {
+	if this.ver.last == nil {
 		return this.rebasedPath()
 	}
 
-	return this.ver.terminus.rebasePath(this.path)
+	return this.ver.last.rebasePath(this.path)
 }
 
 func (this *versionedNode) owner() (gid, uid uint32) {
diff --git a/version.go b/version.go
index 9aa4994..2e820ae 100644
--- a/version.go
+++ b/version.go
@@ -42,14 +42,14 @@ import (
 
 type version struct {
 	base      string
-	parent    *version
-	terminus  *version
+	prev      *version
+	last      *version
 	timestamp time.Time
 	meta      *versionMetadata
 	root      *versionedDir
 }
 
-func newVersion(base string, timestamp time.Time, parent *version) (*version, error) {
+func newVersion(base string, timestamp time.Time, prev *version) (*version, error) {
 	meta, err := newVersionMetadata(filepath.Join(base, "meta.json"))
 	if err != nil {
 		return nil, err
@@ -57,7 +57,7 @@ func newVersion(base string, timestamp time.Time, parent *version) (*version, er
 
 	ver := &version{
 		base:      base,
-		parent:    parent,
+		prev:      prev,
 		timestamp: timestamp,
 		meta:      meta}
 
@@ -66,10 +66,10 @@ func newVersion(base string, timestamp time.Time, parent *version) (*version, er
 
 func (this *version) scanNode(node *versionedNode) (versionedNodeMap, error) {
 	var baseNodes versionedNodeMap
-	if this.parent != nil {
+	if this.prev != nil {
 		var err error
 
-		baseNodes, err = this.parent.scanNode(node)
+		baseNodes, err = this.prev.scanNode(node)
 		if err != nil {
 			return nil, err
 		}
@@ -100,7 +100,7 @@ func (this *version) scanNode(node *versionedNode) (versionedNodeMap, error) {
 	}
 
 	for ownName, ownNode := range ownNodes {
-		ownNode.shadow = baseNodes[ownName]
+		ownNode.prev = baseNodes[ownName]
 		baseNodes[ownName] = ownNode
 	}