支持变量定义 (#5)

* 补全零值 * 支持变量定义
kkkunny · Oct 26, 2023 · 3d07f6c · 3d07f6c
1 parent 2c8392b
commit 3d07f6c
Show file tree

Hide file tree

Showing 17 changed files with 117 additions and 24 deletions.
diff --git a/analyse/expr.go b/analyse/expr.go
@@ -337,7 +337,7 @@ func (self *Analyser) analyseExtract(expect Type, node *ast.Extract) *Extract {
 }
 
 func (self *Analyser) analyseStruct(node *ast.Struct) *Struct {
-	st := self.analyseIdentType(node.Type).(*StructDef)
+	st := self.analyseIdentType(node.Type).(*StructType)
 	fieldNames := hashset.NewHashSet[string]()
 	for iter := st.Fields.Keys().Iterator(); iter.Next(); {
 		fieldNames.Push(iter.Value())
@@ -373,7 +373,7 @@ func (self *Analyser) analyseStruct(node *ast.Struct) *Struct {
 func (self *Analyser) analyseField(node *ast.Field) *Field {
 	from := self.analyseExpr(nil, node.From)
 	fieldName := node.Index.Source()
-	st, ok := from.GetType().(*StructDef)
+	st, ok := from.GetType().(*StructType)
 	if !ok {
 		// TODO: 编译时异常：不能获取类型A的字段
 		panic("unreachable")

diff --git a/analyse/scope.go b/analyse/scope.go
@@ -15,13 +15,13 @@ type _Scope interface {
 // 包作用域
 type _PkgScope struct {
 	values  hashmap.HashMap[string, Ident]
-	structs hashmap.HashMap[string, *StructDef]
+	structs hashmap.HashMap[string, *StructType]
 }
 
 func _NewPkgScope() *_PkgScope {
 	return &_PkgScope{
 		values:  hashmap.NewHashMap[string, Ident](),
-		structs: hashmap.NewHashMap[string, *StructDef](),
+		structs: hashmap.NewHashMap[string, *StructType](),
 	}
 }
 
@@ -37,15 +37,15 @@ func (self *_PkgScope) GetValue(name string) (Ident, bool) {
 	return self.values.Get(name), self.values.ContainKey(name)
 }
 
-func (self *_PkgScope) SetStruct(st *StructDef) bool {
+func (self *_PkgScope) SetStruct(st *StructType) bool {
 	if self.structs.ContainKey(st.Name) {
 		return false
 	}
 	self.structs.Set(st.Name, st)
 	return true
 }
 
-func (self *_PkgScope) GetStruct(name string) (*StructDef, bool) {
+func (self *_PkgScope) GetStruct(name string) (*StructType, bool) {
 	return self.structs.Get(name), self.structs.ContainKey(name)
 }
 

diff --git a/analyse/stmt.go b/analyse/stmt.go
@@ -12,6 +12,8 @@ func (self *Analyser) analyseStmt(node ast.Stmt) (Stmt, bool) {
 	switch stmtNode := node.(type) {
 	case *ast.Return:
 		return self.analyseReturn(stmtNode), true
+	case *ast.Variable:
+		return self.analyseVariable(stmtNode), false
 	case ast.Expr:
 		return self.analyseExpr(nil, stmtNode), false
 	default:
@@ -48,3 +50,15 @@ func (self *Analyser) analyseReturn(node *ast.Return) *Return {
 		return &Return{Value: util.None[Expr]()}
 	}
 }
+
+func (self *Analyser) analyseVariable(node *ast.Variable) *Variable {
+	v := &Variable{Name: node.Name.Source()}
+	if !self.localScope.SetValue(v.Name, v) {
+		// TODO: 编译时异常：变量名冲突
+		panic("unreachable")
+	}
+
+	v.Type = self.analyseType(node.Type)
+	v.Value = self.expectExpr(v.Type, node.Value)
+	return v
+}
diff --git a/ast/stmt.go b/ast/stmt.go
@@ -4,6 +4,7 @@ import (
 	"github.com/kkkunny/stl/container/linkedlist"
 
 	"github.com/kkkunny/Sim/reader"
+	"github.com/kkkunny/Sim/token"
 	"github.com/kkkunny/Sim/util"
 )
 
@@ -26,6 +27,7 @@ func (self *Block) Position() reader.Position {
 
 func (self *Block) stmt() {}
 
+// Return 函数返回
 type Return struct {
 	Begin reader.Position
 	Value util.Option[Expr]
@@ -40,3 +42,17 @@ func (self *Return) Position() reader.Position {
 }
 
 func (self *Return) stmt() {}
+
+// Variable 变量定义
+type Variable struct {
+	Begin reader.Position
+	Name  token.Token
+	Type  Type
+	Value Expr
+}
+
+func (self *Variable) Position() reader.Position {
+	return reader.MixPosition(self.Begin, self.Value.Position())
+}
+
+func (self *Variable) stmt() {}
diff --git a/codegen/expr.go b/codegen/expr.go
@@ -200,7 +200,7 @@ func (self *CodeGenerator) codegenIdent(node mean.Ident) llvm.Value {
 	case *mean.FuncDef:
 		f := self.module.GetFunction(identNode.Name)
 		return f
-	case *mean.Param:
+	case *mean.Param, *mean.Variable:
 		p := self.values[identNode]
 		t := self.codegenType(node.GetType())
 		return self.builder.CreateLoad("", t, p)
@@ -325,6 +325,10 @@ func (self *CodeGenerator) codegenZero(node *mean.Zero) llvm.Value {
 		return self.ctx.ConstFloat(t.(llvm.FloatType), 0)
 	case *mean.BoolType:
 		return self.ctx.ConstInteger(t.(llvm.IntegerType), 0)
+	case *mean.ArrayType:
+		return self.ctx.ConstAggregateZero(t.(llvm.ArrayType))
+	case *mean.StructType:
+		return self.ctx.ConstAggregateZero(t.(llvm.StructType))
 	default:
 		panic("unreachable")
 	}
@@ -334,7 +338,7 @@ func (self *CodeGenerator) codegenStruct(node *mean.Struct) llvm.Value {
 	fields := lo.Map(node.Fields, func(item mean.Expr, index int) llvm.Value {
 		return self.codegenExpr(item)
 	})
-	t := self.codegenStructType(node.GetType().(*mean.StructDef))
+	t := self.codegenStructType(node.GetType().(*mean.StructType))
 	ptr := self.builder.CreateAlloca("", t)
 	for i, field := range fields {
 		ep := self.builder.CreateStructGEP("", t, ptr, uint(i))

diff --git a/codegen/stmt.go b/codegen/stmt.go
@@ -10,6 +10,8 @@ func (self *CodeGenerator) codegenStmt(node mean.Stmt) {
 	switch stmtNode := node.(type) {
 	case *mean.Return:
 		self.codegenReturn(stmtNode)
+	case *mean.Variable:
+		self.codegenVariable(stmtNode)
 	case mean.Expr:
 		self.codegenExpr(stmtNode)
 	default:
@@ -39,3 +41,11 @@ func (self *CodeGenerator) codegenReturn(node *mean.Return) {
 		self.builder.CreateRet(nil)
 	}
 }
+
+func (self *CodeGenerator) codegenVariable(node *mean.Variable) {
+	t := self.codegenType(node.Type)
+	value := self.codegenExpr(node.Value)
+	ptr := self.builder.CreateAlloca("", t)
+	self.builder.CreateStore(value, ptr)
+	self.values[node] = ptr
+}
diff --git a/codegen/type.go b/codegen/type.go
@@ -23,7 +23,7 @@ func (self *CodeGenerator) codegenType(node mean.Type) llvm.Type {
 		return self.codegenArrayType(typeNode)
 	case *mean.TupleType:
 		return self.codegenTupleType(typeNode)
-	case *mean.StructDef:
+	case *mean.StructType:
 		return self.codegenStructType(typeNode)
 	default:
 		panic("unreachable")
@@ -77,7 +77,7 @@ func (self *CodeGenerator) codegenTupleType(node *mean.TupleType) llvm.StructTyp
 	return self.ctx.StructType(false, elems...)
 }
 
-func (self *CodeGenerator) codegenStructType(node *mean.StructDef) llvm.StructType {
+func (self *CodeGenerator) codegenStructType(node *mean.StructType) llvm.StructType {
 	fields := make([]llvm.Type, node.Fields.Length())
 	var i int
 	for iter := node.Fields.Iterator(); iter.Next(); i++ {

diff --git a/example/main.sim b/example/main.sim
@@ -1,11 +1,4 @@
-struct T{
-    data: u8
-}
-
-func get()T{
-    return T{data: 1}
-}
-
 func main()u8{
-    return get().data - 1
+    let i: u8 = 1;
+    return i
 }
diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.21.3
 require github.com/kkkunny/stl v0.0.0-20231022115244-2d9f235921a3
 
 require (
-	github.com/kkkunny/go-llvm v0.0.0-20231022112819-c995932e65e0
+	github.com/kkkunny/go-llvm v0.0.0-20231022134249-a7ebd2dcb283
 	github.com/samber/lo v1.38.1
 	golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
 )

diff --git a/go.sum b/go.sum
@@ -4,6 +4,8 @@ github.com/kkkunny/go-llvm v0.0.0-20231022091327-288268740f4d h1:GTKwPcr9hrQBGUw
 github.com/kkkunny/go-llvm v0.0.0-20231022091327-288268740f4d/go.mod h1:3vOsdDMD0flAC4YHxfqUZ2juZ40oCI/5HBIVPKGLT34=
 github.com/kkkunny/go-llvm v0.0.0-20231022112819-c995932e65e0 h1:TrL7WoxBUXfMdoNwFOWKOGWo9oBZTAkCmnczcEy5/YA=
 github.com/kkkunny/go-llvm v0.0.0-20231022112819-c995932e65e0/go.mod h1:3vOsdDMD0flAC4YHxfqUZ2juZ40oCI/5HBIVPKGLT34=
+github.com/kkkunny/go-llvm v0.0.0-20231022134249-a7ebd2dcb283 h1:BwHJQXiNrXXMiXDnFxsVTRXOsatEqtVOKwAyoVc06AA=
+github.com/kkkunny/go-llvm v0.0.0-20231022134249-a7ebd2dcb283/go.mod h1:3vOsdDMD0flAC4YHxfqUZ2juZ40oCI/5HBIVPKGLT34=
 github.com/kkkunny/stl v0.0.0-20231014052322-46f1c45686f0 h1:VAtB9hn2SIdUjV9o+1ieqoaMQ95cuwgnzdbJGyrLBn4=
 github.com/kkkunny/stl v0.0.0-20231014052322-46f1c45686f0/go.mod h1:4TbqW9zjHIpp/0Auz1/nyec9WsiMN878ifaEPwVSdkE=
 github.com/kkkunny/stl v0.0.0-20231022115244-2d9f235921a3 h1:okBRIiEPszBnpp5S+QAIFrXKh1uzoxE6cpCI26vuFlU=

diff --git a/lex/lexer.go b/lex/lexer.go
@@ -100,6 +100,8 @@ func (self *Lexer) Scan() Token {
 		switch ch {
 		case 0:
 			kind = EOF
+		case '=':
+			kind = ASS
 		case '&':
 			kind = AND
 		case '|':

diff --git a/mean/expr.go b/mean/expr.go
@@ -409,7 +409,7 @@ func (*Param) ident() {}
 
 // Struct 结构体
 type Struct struct {
-	Type   *StructDef
+	Type   *StructType
 	Fields []Expr
 }
 
@@ -439,5 +439,5 @@ type Field struct {
 func (self *Field) stmt() {}
 
 func (self *Field) GetType() Type {
-	return self.From.GetType().(*StructDef).Fields.Values().Get(self.Index)
+	return self.From.GetType().(*StructType).Fields.Values().Get(self.Index)
 }
diff --git a/mean/stmt.go b/mean/stmt.go
@@ -16,10 +16,26 @@ type Block struct {
 	Stmts linkedlist.LinkedList[Stmt]
 }
 
-func (self *Block) stmt() {}
+func (*Block) stmt() {}
 
+// Return 函数返回
 type Return struct {
 	Value util.Option[Expr]
 }
 
-func (self *Return) stmt() {}
+func (*Return) stmt() {}
+
+// Variable 变量定义
+type Variable struct {
+	Type  Type
+	Name  string
+	Value Expr
+}
+
+func (*Variable) stmt() {}
+
+func (self *Variable) GetType() Type {
+	return self.Type
+}
+
+func (*Variable) ident() {}
diff --git a/mean/type.go b/mean/type.go
@@ -171,3 +171,5 @@ func (self *TupleType) Equal(dst Type) bool {
 	}
 	return true
 }
+
+type StructType = StructDef
diff --git a/parse/stmt.go b/parse/stmt.go
@@ -11,6 +11,8 @@ func (self *Parser) parseStmt() Stmt {
 	switch self.nextTok.Kind {
 	case token.RETURN:
 		return self.parseReturn()
+	case token.LET:
+		return self.parseVariable()
 	default:
 		return self.mustExpr(self.parseOptionExpr(true))
 	}
@@ -47,3 +49,18 @@ func (self *Parser) parseReturn() *Return {
 		Value: value,
 	}
 }
+
+func (self *Parser) parseVariable() *Variable {
+	begin := self.expectNextIs(token.LET).Position
+	name := self.expectNextIs(token.IDENT)
+	self.expectNextIs(token.COL)
+	typ := self.parseType()
+	self.expectNextIs(token.ASS)
+	value := self.mustExpr(self.parseOptionExpr(true))
+	return &Variable{
+		Begin: begin,
+		Name:  name,
+		Type:  typ,
+		Value: value,
+	}
+}
diff --git a/test/variable_test.go b/test/variable_test.go
@@ -0,0 +1,12 @@
+package test
+
+import "testing"
+
+func TestVariable(t *testing.T) {
+	assertRetEqZero(t, `
+func main()u8{
+    let i: u8 = 1;
+    return i - 1
+}
+`)
+}
diff --git a/token/kind.go b/token/kind.go
@@ -11,6 +11,8 @@ const (
 	INTEGER
 	FLOAT
 
+	ASS
+
 	AND
 	OR
 	XOR
@@ -45,6 +47,7 @@ const (
 	FALSE
 	AS
 	STRUCT
+	LET
 	_KeywordEnd
 )
 
@@ -54,6 +57,7 @@ var kindNames = [...]string{
 	IDENT:   "ident",
 	INTEGER: "integer",
 	FLOAT:   "float",
+	ASS:     "ass",
 	AND:     "and",
 	OR:      "or",
 	XOR:     "xor",
@@ -82,6 +86,7 @@ var kindNames = [...]string{
 	FALSE:   "false",
 	AS:      "as",
 	STRUCT:  "struct",
+	LET:     "let",
 }
 
 // Lookup 区分标识符和关键字