默认输出编译文件至同目录

README.md

@@ -69,10 +69,7 @@ fn Header:__str() {
 处理监听事件
 `req`包含属性`method`, `url`, `body`, `headers`
 */
-shy fn handle(req) {
-    shy h = Header:fromTable(req.headers)
-    rt 200, fmt('%s %s\n\n%s\n%s', req.method, req.url, h, req.body)
-}
+handle := fn(req) => 200, fmt('%s %s\n\n%s\n%s', req.method, req.url, Header:fromTable(req.headers), req.body)
 
 // 监听
 if http.listen(':8080', handle) != nil {
@@ -100,7 +97,6 @@ if http.listen(':8080', handle) != nil {
   - [x] 自动添加 `range` ( `paris` )
   - [x] 支持 `a++` `a+=b` 等
 - [x] CLI
-  - [x] 利用HASH，文件无变化不编译
   - [x] 支持传入参数 ( `lk args.lk arg1` -> `.lk`内调用`os.args` )
   - [x] REPL，直接运行 `./lk` 即可进入
     - [x] 支持方向键

binchunk/binary_chunk.go

@@ -53,14 +53,15 @@ type LocVar struct {
 	EndPC   uint32 `json:"epc"`
 }
 
-func IsJsonChunk(data []byte) (bool, *Prototype) {
+func Verify(data []byte) (bool, *Prototype) {
 	var bin binaryChunk
 	err := json.Unmarshal(data, &bin)
 	if err != nil {
 		return false, nil
 	}
 	if bin.Sign != consts.SIGNATURE || bin.Version != consts.VERSION {
-		panic("mismatch version or signature")
+		println("mismatch version or signature\n")
+		return false, nil
 	}
 	return err == nil, bin.Proto
 }

compiler/parser/parse_stat.go

@@ -218,9 +218,9 @@ func parseAssignStat(lexer *Lexer, var0 Exp) Stat {
 	if lexer.LookAhead() == TOKEN_OP_ASSIGNSHY {
 		lexer.NextToken()             // :=
 		expList := parseExpList(lexer) // explist
-		strExps := make([]string, len(expList))
-		for i, exp := range varList {
-			name, ok := exp.(*NameExp)
+		strExps := make([]string, len(varList))
+		for i := range varList {
+			name, ok := varList[i].(*NameExp)
 			if !ok {
 				panic("invalid assignment")
 			}

main.go

@@ -8,7 +8,6 @@ import (
 )
 
 var (
-	force = flag.Bool("f", false, "force to re-compile")
 	debug = flag.Bool("d", false, "debug mode")
 	args = []string{}
 )

run.go

@@ -1,18 +1,15 @@
 package main
 
 import (
-	"crypto/sha256"
-	"encoding/hex"
 	"io/ioutil"
 	"os"
-	"path"
 
 	"git.lolli.tech/lollipopkit/lk/binchunk"
 	"git.lolli.tech/lollipopkit/lk/compiler"
 	"git.lolli.tech/lollipopkit/lk/state"
 )
 
-func compile(source string) {
+func compile(source string) []byte {
 	if !exist(source) {
 		panic("file not found")
 	}
@@ -32,6 +29,7 @@ func compile(source string) {
 		panic(err)
 	}
 	f.Write(compiledData)
+	return compiledData
 }
 
 func run(file string) {
@@ -44,24 +42,14 @@ func run(file string) {
 		panic(err)
 	}
 
-	compiledFileName := getSHA256HashCode(data) + ".lkc"
-	compiledFilePath := path.Join(os.TempDir(), compiledFileName)
+	compiledFilePath := file + "c"
 	compiledData, _ := ioutil.ReadFile(compiledFilePath)
 
-	isJChunk, _ := binchunk.IsJsonChunk(data)
-	if isJChunk {
+	valid, _ := binchunk.Verify(data)
+	if valid {
 		compiledData = data
-	} else if !exist(compiledFilePath) || *force {
-		bin := compiler.Compile(string(data), file)
-		f, err := os.Create(compiledFilePath)
-		if err != nil {
-			panic(err)
-		}
-		compiledData, err = bin.Dump()
-		if err != nil {
-			panic(err)
-		}
-		f.Write(compiledData)
+	} else {
+		compile(file)
 	}
 
 	ls := state.New()
@@ -74,9 +62,3 @@ func exist(path string) bool {
 	_, err := os.Stat(path)
 	return !os.IsNotExist(err)
 }
-
-func getSHA256HashCode(message []byte) string {
-	bytes := sha256.Sum256(message)
-	hashCode := hex.EncodeToString(bytes[:])
-	return hashCode
-}

state/api_call.go

@@ -14,7 +14,7 @@ import (
 // http://www.lua.org/manual/5.3/manual.html#lua_load
 func (self *luaState) Load(chunk []byte, chunkName, mode string) int {
 	var proto *binchunk.Prototype
-	isJson, prot := binchunk.IsJsonChunk(chunk)
+	isJson, prot := binchunk.Verify(chunk)
 	logger.I("[state.Load] Using compiled chunk: %v", isJson)
 	if isJson {
 		proto = prot