aboutsummaryrefslogtreecommitdiff
path: root/var.go
diff options
context:
space:
mode:
authorFumitoshi Ukai <fumitoshi.ukai@gmail.com>2015-06-25 12:42:19 +0900
committerFumitoshi Ukai <fumitoshi.ukai@gmail.com>2015-06-25 12:42:19 +0900
commit7bf992dc15d967b7426493bd0e8bb2cb9af7f0e6 (patch)
treefe928f5d7dfe4ec62e7fc9f403c9a651fba1a349 /var.go
parentb9b80a9a5fee1815bf580972d3a44dc6f5da6062 (diff)
unexport *Var
Diffstat (limited to 'var.go')
-rw-r--r--var.go110
1 files changed, 55 insertions, 55 deletions
diff --git a/var.go b/var.go
index a28ae12..774a38a 100644
--- a/var.go
+++ b/var.go
@@ -29,82 +29,82 @@ type Var interface {
IsDefined() bool
}
-type TargetSpecificVar struct {
+type targetSpecificVar struct {
v Var
op string
}
-func (v *TargetSpecificVar) Append(ev *Evaluator, s string) Var {
- return &TargetSpecificVar{
+func (v *targetSpecificVar) Append(ev *Evaluator, s string) Var {
+ return &targetSpecificVar{
v: v.v.Append(ev, s),
op: v.op,
}
}
-func (v *TargetSpecificVar) AppendVar(ev *Evaluator, v2 Value) Var {
- return &TargetSpecificVar{
+func (v *targetSpecificVar) AppendVar(ev *Evaluator, v2 Value) Var {
+ return &targetSpecificVar{
v: v.v.AppendVar(ev, v2),
op: v.op,
}
}
-func (v *TargetSpecificVar) Flavor() string {
+func (v *targetSpecificVar) Flavor() string {
return v.v.Flavor()
}
-func (v *TargetSpecificVar) Origin() string {
+func (v *targetSpecificVar) Origin() string {
return v.v.Origin()
}
-func (v *TargetSpecificVar) IsDefined() bool {
+func (v *targetSpecificVar) IsDefined() bool {
return v.v.IsDefined()
}
-func (v *TargetSpecificVar) String() string {
+func (v *targetSpecificVar) String() string {
// TODO: If we add the info of |op| a test starts
// failing. Shouldn't we use this only for debugging?
return v.v.String()
// return v.v.String() + " (op=" + v.op + ")"
}
-func (v *TargetSpecificVar) Eval(w io.Writer, ev *Evaluator) {
+func (v *targetSpecificVar) Eval(w io.Writer, ev *Evaluator) {
v.v.Eval(w, ev)
}
-func (v *TargetSpecificVar) Serialize() SerializableVar {
+func (v *targetSpecificVar) Serialize() SerializableVar {
return SerializableVar{
Type: v.op,
Children: []SerializableVar{v.v.Serialize()},
}
}
-func (v *TargetSpecificVar) Dump(w io.Writer) {
+func (v *targetSpecificVar) Dump(w io.Writer) {
dumpByte(w, valueTypeTSV)
dumpString(w, v.op)
v.v.Dump(w)
}
-type SimpleVar struct {
+type simpleVar struct {
value string
origin string
}
-func (v *SimpleVar) Flavor() string { return "simple" }
-func (v *SimpleVar) Origin() string { return v.origin }
-func (v *SimpleVar) IsDefined() bool { return true }
+func (v *simpleVar) Flavor() string { return "simple" }
+func (v *simpleVar) Origin() string { return v.origin }
+func (v *simpleVar) IsDefined() bool { return true }
-func (v *SimpleVar) String() string { return v.value }
-func (v *SimpleVar) Eval(w io.Writer, ev *Evaluator) {
+func (v *simpleVar) String() string { return v.value }
+func (v *simpleVar) Eval(w io.Writer, ev *Evaluator) {
io.WriteString(w, v.value)
}
-func (v *SimpleVar) Serialize() SerializableVar {
+func (v *simpleVar) Serialize() SerializableVar {
return SerializableVar{
Type: "simple",
V: v.value,
Origin: v.origin,
}
}
-func (v *SimpleVar) Dump(w io.Writer) {
+func (v *simpleVar) Dump(w io.Writer) {
dumpByte(w, valueTypeSimple)
dumpString(w, v.value)
dumpString(w, v.origin)
}
-func (v *SimpleVar) Append(ev *Evaluator, s string) Var {
+func (v *simpleVar) Append(ev *Evaluator, s string) Var {
val, _, err := parseExpr([]byte(s), nil, false)
if err != nil {
panic(err)
@@ -118,7 +118,7 @@ func (v *SimpleVar) Append(ev *Evaluator, s string) Var {
return v
}
-func (v *SimpleVar) AppendVar(ev *Evaluator, val Value) Var {
+func (v *simpleVar) AppendVar(ev *Evaluator, val Value) Var {
abuf := newBuf()
io.WriteString(abuf, v.value)
writeByte(abuf, ' ')
@@ -128,26 +128,26 @@ func (v *SimpleVar) AppendVar(ev *Evaluator, val Value) Var {
return v
}
-type AutomaticVar struct {
+type automaticVar struct {
value []byte
}
-func (v *AutomaticVar) Flavor() string { return "simple" }
-func (v *AutomaticVar) Origin() string { return "automatic" }
-func (v *AutomaticVar) IsDefined() bool { return true }
+func (v *automaticVar) Flavor() string { return "simple" }
+func (v *automaticVar) Origin() string { return "automatic" }
+func (v *automaticVar) IsDefined() bool { return true }
-func (v *AutomaticVar) String() string { return string(v.value) }
-func (v *AutomaticVar) Eval(w io.Writer, ev *Evaluator) {
+func (v *automaticVar) String() string { return string(v.value) }
+func (v *automaticVar) Eval(w io.Writer, ev *Evaluator) {
w.Write(v.value)
}
-func (v *AutomaticVar) Serialize() SerializableVar {
+func (v *automaticVar) Serialize() SerializableVar {
panic(fmt.Sprintf("cannnot serialize automatic var:%s", v.value))
}
-func (v *AutomaticVar) Dump(w io.Writer) {
+func (v *automaticVar) Dump(w io.Writer) {
panic(fmt.Sprintf("cannnot dump automatic var:%s", v.value))
}
-func (v *AutomaticVar) Append(ev *Evaluator, s string) Var {
+func (v *automaticVar) Append(ev *Evaluator, s string) Var {
val, _, err := parseExpr([]byte(s), nil, false)
if err != nil {
panic(err)
@@ -159,7 +159,7 @@ func (v *AutomaticVar) Append(ev *Evaluator, s string) Var {
return v
}
-func (v *AutomaticVar) AppendVar(ev *Evaluator, val Value) Var {
+func (v *automaticVar) AppendVar(ev *Evaluator, val Value) Var {
buf := bytes.NewBuffer(v.value)
buf.WriteByte(' ')
val.Eval(buf, ev)
@@ -167,33 +167,33 @@ func (v *AutomaticVar) AppendVar(ev *Evaluator, val Value) Var {
return v
}
-type RecursiveVar struct {
+type recursiveVar struct {
expr Value
origin string
}
-func (v *RecursiveVar) Flavor() string { return "recursive" }
-func (v *RecursiveVar) Origin() string { return v.origin }
-func (v *RecursiveVar) IsDefined() bool { return true }
+func (v *recursiveVar) Flavor() string { return "recursive" }
+func (v *recursiveVar) Origin() string { return v.origin }
+func (v *recursiveVar) IsDefined() bool { return true }
-func (v *RecursiveVar) String() string { return v.expr.String() }
-func (v *RecursiveVar) Eval(w io.Writer, ev *Evaluator) {
+func (v *recursiveVar) String() string { return v.expr.String() }
+func (v *recursiveVar) Eval(w io.Writer, ev *Evaluator) {
v.expr.Eval(w, ev)
}
-func (v *RecursiveVar) Serialize() SerializableVar {
+func (v *recursiveVar) Serialize() SerializableVar {
return SerializableVar{
Type: "recursive",
Children: []SerializableVar{v.expr.Serialize()},
Origin: v.origin,
}
}
-func (v *RecursiveVar) Dump(w io.Writer) {
+func (v *recursiveVar) Dump(w io.Writer) {
dumpByte(w, valueTypeRecursive)
v.expr.Dump(w)
dumpString(w, v.origin)
}
-func (v *RecursiveVar) Append(_ *Evaluator, s string) Var {
+func (v *recursiveVar) Append(_ *Evaluator, s string) Var {
var expr Expr
if e, ok := v.expr.(Expr); ok {
expr = append(e, literal(" "))
@@ -213,7 +213,7 @@ func (v *RecursiveVar) Append(_ *Evaluator, s string) Var {
return v
}
-func (v *RecursiveVar) AppendVar(ev *Evaluator, val Value) Var {
+func (v *recursiveVar) AppendVar(ev *Evaluator, val Value) Var {
var buf bytes.Buffer
buf.WriteString(v.expr.String())
buf.WriteByte(' ')
@@ -226,27 +226,27 @@ func (v *RecursiveVar) AppendVar(ev *Evaluator, val Value) Var {
return v
}
-type UndefinedVar struct{}
+type undefinedVar struct{}
-func (UndefinedVar) Flavor() string { return "undefined" }
-func (UndefinedVar) Origin() string { return "undefined" }
-func (UndefinedVar) IsDefined() bool { return false }
-func (UndefinedVar) String() string { return "" }
-func (UndefinedVar) Eval(_ io.Writer, _ *Evaluator) {
+func (undefinedVar) Flavor() string { return "undefined" }
+func (undefinedVar) Origin() string { return "undefined" }
+func (undefinedVar) IsDefined() bool { return false }
+func (undefinedVar) String() string { return "" }
+func (undefinedVar) Eval(_ io.Writer, _ *Evaluator) {
}
-func (UndefinedVar) Serialize() SerializableVar {
+func (undefinedVar) Serialize() SerializableVar {
return SerializableVar{Type: "undefined"}
}
-func (UndefinedVar) Dump(w io.Writer) {
+func (undefinedVar) Dump(w io.Writer) {
dumpByte(w, valueTypeUndefined)
}
-func (UndefinedVar) Append(*Evaluator, string) Var {
- return UndefinedVar{}
+func (undefinedVar) Append(*Evaluator, string) Var {
+ return undefinedVar{}
}
-func (UndefinedVar) AppendVar(_ *Evaluator, val Value) Var {
- return UndefinedVar{}
+func (undefinedVar) AppendVar(_ *Evaluator, val Value) Var {
+ return undefinedVar{}
}
type Vars map[string]Var
@@ -255,7 +255,7 @@ func (vt Vars) Lookup(name string) Var {
if v, ok := vt[name]; ok {
return v
}
- return UndefinedVar{}
+ return undefinedVar{}
}
func (vt Vars) Assign(name string, v Var) {