Przeglądaj źródła

FIX.统一代码风格

RegMs If 4 lat temu
rodzic
commit
473e37fe02
2 zmienionych plików z 14 dodań i 10 usunięć
  1. 12 8
      conv.go
  2. 2 2
      mua.go

+ 12 - 8
conv.go

@@ -166,23 +166,27 @@ func escapeWord(s string) string {
 }
 
 func isName(val value) bool {
-	return nameExp.MatchString(val.String())
+	s := val.String()
+	return nameExp.MatchString(s)
 }
 
 func toName(val value) string {
-	if nameExp.MatchString(val.String()) {
-		return val.String()
+	s := val.String()
+	if nameExp.MatchString(s) {
+		return s
 	}
-	panic(fmt.Errorf("name: %s (%s)", errInvalidName, val.String()))
+	panic(fmt.Errorf("name: %s (%s)", errInvalidName, s))
 }
 
 func isNameWithIndex(val value) bool {
-	return nameWithIndexExp.MatchString(val.String())
+	s := val.String()
+	return nameWithIndexExp.MatchString(s)
 }
 
 func toNameWithIndex(val value) (string, []string) {
-	if nameWithIndexExp.MatchString(val.String()) {
-		index := strings.Split(val.String(), "[")
+	s := val.String()
+	if nameWithIndexExp.MatchString(s) {
+		index := strings.Split(s, "[")
 		name := index[0]
 		if cnt := len(index) - 1; cnt > 0 {
 			for i := 1; i < cnt; i++ {
@@ -192,7 +196,7 @@ func toNameWithIndex(val value) (string, []string) {
 		}
 		return name, index[1:]
 	}
-	panic(fmt.Errorf("name: %s (%s)", errInvalidName, val.String()))
+	panic(fmt.Errorf("name: %s (%s)", errInvalidName, s))
 }
 
 func isList(val value) bool {

+ 2 - 2
mua.go

@@ -36,9 +36,9 @@ func interpret(scanner *scanProvider, envs []environ) (val value, returned bool)
 		}
 		if s[0] == ':' {
 			leading := len(s) - len(strings.TrimLeft(s, ":"))
-			val := toValue(&_unknown{s: `"` + s[leading:]}, envs)
+			val := value(&_unknown{s: `"` + s[leading:]})
 			for i := 0; i < leading; i++ {
-				val = toValue(opThing(val, envs), envs)
+				val = opThing(toValue(val, envs), envs)
 			}
 			stack = append(stack, val)
 		} else if s[0] == '[' && !scanner.isList {