新增 os.cp input，库string -> strs

ast.go

@@ -20,9 +20,9 @@ func WriteAst(path string) {
 	if err != nil {
 		term.Error(err.Error())
 	}
-	
+
 	err = ioutil.WriteFile(path+".ast.json", j, 0644)
 	if err != nil {
 		term.Error(err.Error())
 	}
-}
+}

compiler/parser/parser.go

@@ -35,8 +35,6 @@ func Parse(chunk, chunkName string) *Block {
 	lexer := NewLexer(chunk, chunkName)
 	block := parseBlock(lexer)
 
-
-
 	lexer.NextTokenOfKind(TOKEN_EOF)
 	return block
 }

repl.go

@@ -26,7 +26,6 @@ var (
 	printReg    = regexp.MustCompile(`print\(.*\)`)
 )
 
-
 func repl(wg *sync.WaitGroup) {
 	ls := state.New()
 	ls.OpenLibs()
@@ -36,7 +35,7 @@ func repl(wg *sync.WaitGroup) {
 	blockStartCount := 0
 	blockEndCount := 0
 	wg.Wait()
-	
+
 	for {
 		line := term.ReadLine(linesHistory)
 		if line == "" {

state/auxlib.go

@@ -287,17 +287,17 @@ func (self *luaState) CallMeta(obj int, event string) bool {
 // http://www.lua.org/manual/5.3/manual.html#luaL_openlibs
 func (self *luaState) OpenLibs() {
 	libs := map[string]GoFunction{
-		"_G":     stdlib.OpenBaseLib,
-		"math":   stdlib.OpenMathLib,
-		"string": stdlib.OpenStringLib,
-		"utf8":   stdlib.OpenUTF8Lib,
-		"os":     stdlib.OpenOSLib,
-		"pkg":    stdlib.OpenPackageLib,
-		"sync":   stdlib.OpenCoroutineLib,
-		"http":   stdlib.OpenHttpLib,
-		"json":   stdlib.OpenJsonLib,
-		"re":     stdlib.OpenReLib,
-		"rand":   stdlib.OpenRandLib,
+		"_G":   stdlib.OpenBaseLib,
+		"math": stdlib.OpenMathLib,
+		"strs": stdlib.OpenStringLib,
+		"utf8": stdlib.OpenUTF8Lib,
+		"os":   stdlib.OpenOSLib,
+		"pkg":  stdlib.OpenPackageLib,
+		"sync": stdlib.OpenCoroutineLib,
+		"http": stdlib.OpenHttpLib,
+		"json": stdlib.OpenJsonLib,
+		"re":   stdlib.OpenReLib,
+		"rand": stdlib.OpenRandLib,
 	}
 
 	for name := range libs {

stdlib/lib_basic.go

@@ -12,7 +12,7 @@ import (
 var baseFuncs = map[string]GoFunction{
 	"new":       baseNew,
 	"print":     basePrint,
-	"input":    baseInput,
+	"input":     baseInput,
 	"assert":    baseAssert,
 	"error":     baseError,
 	"irange":    baseIPairs,

stdlib/lib_os.go

@@ -18,6 +18,7 @@ var sysLib = map[string]GoFunction{
 	"date":    osDate,
 	"rm":      osRemove,
 	"mv":      osRename,
+	"cp":      osCp,
 	"link":    osLink,
 	"tmp":     osTmpName,
 	"get_env": osGetEnv,
@@ -42,6 +43,17 @@ func pushArgs(ls LkState) {
 	ls.SetField(-2, "args")
 }
 
+func osCp(ls LkState) int {
+	src := ls.CheckString(1)
+	dst := ls.CheckString(2)
+	if err := utils.Copy(src, dst); err != nil {
+		ls.PushString(err.Error())
+		return 1
+	}
+	ls.PushNil()
+	return 1
+}
+
 func osStat(ls LkState) int {
 	path := ls.CheckString(1)
 	info, err := os.Stat(path)

stdlib/lib_re.go

@@ -26,13 +26,11 @@ func getExp(pattern string) *regexp.Regexp {
 	if ok {
 		exp, ok = cache.(*regexp.Regexp)
 		if ok {
-			goto END
+			return exp
 		}
-
 	}
 	exp = regexp.MustCompile(pattern)
 	reCacher.Set(pattern, exp)
-END:
 	return exp
 }
 
@@ -51,11 +49,6 @@ func reFind(ls LkState) int {
 		ls.PushNil()
 		return 1
 	}
-	tb := make(map[string]string, len(matches))
-	names := getExp(pattern).SubexpNames()
-	for idx := range names {
-		tb[names[idx]] = matches[idx]
-	}
-	pushTable(&ls, tb)
+	pushList(&ls, matches)
 	return 1
 }

stdlib/lib_string.go

@@ -8,16 +8,17 @@ import (
 )
 
 var strLib = map[string]GoFunction{
-	"len":     strLen,
-	"repeat":  strRep,
-	"reverse": strReverse,
-	"lower":   strLower,
-	"upper":   strUpper,
-	"sub":     strSub,
-	"byte":    strByte,
-	"char":    strChar,
-	"split":   strSplit,
-	"join":    strJoin,
+	"len":      strLen,
+	"repeat":   strRep,
+	"reverse":  strReverse,
+	"lower":    strLower,
+	"upper":    strUpper,
+	"sub":      strSub,
+	"byte":     strByte,
+	"char":     strChar,
+	"split":    strSplit,
+	"join":     strJoin,
+	"contains": strContains,
 }
 
 func OpenStringLib(ls LkState) int {
@@ -27,6 +28,13 @@ func OpenStringLib(ls LkState) int {
 
 /* Basic String Functions */
 
+func strContains(ls LkState) int {
+	s := ls.CheckString(1)
+	sub := ls.CheckString(2)
+	ls.PushBoolean(strings.Contains(s, sub))
+	return 1
+}
+
 func strJoin(ls LkState) int {
 	list := CheckList(&ls, 1)
 	sep := ls.CheckString(2)

term/interact.go

@@ -13,7 +13,7 @@ const (
 )
 
 var (
-	promptLen   = len([]rune(prompt))
+	promptLen = len([]rune(prompt))
 )
 
 func ReadLine(linesHistory []string) string {
@@ -92,4 +92,4 @@ func resetLine(str string) {
 	cursor.ClearLine()
 	cursor.StartOfLine()
 	print(prompt + str)
-}
+}

test.lk

@@ -14,7 +14,7 @@ contains := fn(name) {
 }
 
 for _, file in files {
-    if string.sub(file, #file - 3) != '.lkc' {
+    if strs.sub(file, #file - 3) != '.lkc' {
         if not contains(file) {
             print(fmt('====== %s ======', file))
             do_file(dir + file)

utils/copy.go

@@ -0,0 +1,80 @@
+package utils
+
+import (
+	"io"
+	"io/ioutil"
+	"os"
+	"path"
+)
+
+func Copy(src, dst string) error {
+	var err error
+	var srcinfo os.FileInfo
+
+	if srcinfo, err = os.Stat(src); err != nil {
+		return err
+	}
+
+	if !srcinfo.IsDir() {
+		return copyFile(src, dst)
+	}
+	return copyDir(src, dst)
+}
+
+func copyFile(src, dst string) error {
+	var err error
+	var srcfd *os.File
+	var dstfd *os.File
+	var srcinfo os.FileInfo
+
+	if srcfd, err = os.Open(src); err != nil {
+		return err
+	}
+	defer srcfd.Close()
+
+	if dstfd, err = os.Create(dst); err != nil {
+		return err
+	}
+	defer dstfd.Close()
+
+	if _, err = io.Copy(dstfd, srcfd); err != nil {
+		return err
+	}
+	if srcinfo, err = os.Stat(src); err != nil {
+		return err
+	}
+	return os.Chmod(dst, srcinfo.Mode())
+}
+
+func copyDir(src string, dst string) error {
+	var err error
+	var fds []os.FileInfo
+	var srcinfo os.FileInfo
+
+	if srcinfo, err = os.Stat(src); err != nil {
+		return err
+	}
+
+	if err = os.MkdirAll(dst, srcinfo.Mode()); err != nil {
+		return err
+	}
+
+	if fds, err = ioutil.ReadDir(src); err != nil {
+		return err
+	}
+	for _, fd := range fds {
+		srcfp := path.Join(src, fd.Name())
+		dstfp := path.Join(dst, fd.Name())
+
+		if fd.IsDir() {
+			if err = copyDir(srcfp, dstfp); err != nil {
+				return err
+			}
+		} else {
+			if err = copyFile(srcfp, dstfp); err != nil {
+				return err
+			}
+		}
+	}
+	return nil
+}

utils/upgrade.go

@@ -47,7 +47,6 @@ func CheckUpgrade(wg *sync.WaitGroup) {
 		return
 	}
 
-
 	resp, err := client.Get(consts.ReleaseApiUrl)
 	if err != nil {
 		return