parser 增加泛型宏参数解析; 类型定义必须 : 分隔

chai2010 · chai2010 · commit 292168f99581 · 2024-01-13T00:44:45.000+08:00
diff --git a/internal/parser/parser.go b/internal/parser/parser.go
@@ -847,7 +847,7 @@ func (p *parser) parseParameterList(scope *ast.Scope, ellipsisOk bool) (params [
 			colonPos = p.pos
 			p.next()
 		} else {
-			if p.tok != token.RPAREN {
+			if p.tok != token.RPAREN && p.tok != token.RBRACK {
 				p.expect(token.COLON)
 			}
 		}
@@ -941,6 +941,33 @@ func (p *parser) parseResult(scope *ast.Scope) *ast.FieldList {
 	return nil
 }
 
+func (p *parser) parseTypeParams(scope *ast.Scope) (tparams *ast.FieldList) {
+	if p.trace {
+		defer un(trace(p, "TypeParams"))
+	}
+
+	// 数组和切片歧义, 必须加 ':' 分隔
+	// type byteReplacer :[256]byte
+	// type byteReplacer :[]byte
+
+	if p.tok != token.LBRACK {
+		return nil
+	}
+
+	lparen := p.expect(token.LBRACK)
+
+	if p.tok == token.RBRACK {
+		p.next()
+		return nil
+	}
+
+	params := p.parseParameterList(scope, false)
+	rparen := p.expect(token.RBRACK)
+
+	tparams = &ast.FieldList{Opening: lparen, List: params, Closing: rparen}
+	return
+}
+
 func (p *parser) parseSignature(scope *ast.Scope) (params, results *ast.FieldList, arrowPos token.Pos) {
 	if p.trace {
 		defer un(trace(p, "Signature"))
@@ -986,13 +1013,16 @@ func (p *parser) parseFuncType() (*ast.FuncType, *ast.Scope) {
 
 	pos := p.expect(token.FUNC)
 	scope := ast.NewScope(p.topScope) // function scope
+
+	tparams := p.parseTypeParams(scope)
 	params, results, arrowPos := p.parseSignature(scope)
 
 	return &ast.FuncType{
-		Func:     pos,
-		Params:   params,
-		ArrowPos: arrowPos,
-		Results:  results,
+		Func:       pos,
+		TypeParams: tparams,
+		Params:     params,
+		ArrowPos:   arrowPos,
+		Results:    results,
 	}, scope
 }
 
@@ -2439,12 +2469,20 @@ func (p *parser) parseTypeSpec(doc *ast.CommentGroup, _ token.Token, _ int) ast.
 	// containing block.
 	// (Global identifiers are resolved in a separate phase after parsing.)
 	spec := &ast.TypeSpec{Doc: doc, Name: ident}
+	spec.TypeParams = p.parseTypeParams(p.topScope)
 	p.declare(spec, nil, p.topScope, ast.Typ, ident)
 	if p.tok == token.COLON {
 		spec.ColonPos = p.pos
 		p.next()
 	}
 	spec.Type = p.parseType()
+
+	if _, ok := spec.Type.(*ast.StructType); !ok {
+		if spec.TypeParams != nil {
+			p.error(spec.TypeParams.Opening, "type params only support struct type")
+		}
+	}
+
 	p.expectSemi() // call before accessing p.linecomment
 	spec.Comment = p.lineComment
 
@@ -2523,6 +2561,7 @@ func (p *parser) parseFuncDecl() *ast.FuncDecl {
 		}
 	}
 
+	tparams := p.parseTypeParams(scope)
 	params, results, arrowPos := p.parseSignature(scope)
 
 	var body *ast.BlockStmt
@@ -2536,10 +2575,11 @@ func (p *parser) parseFuncDecl() *ast.FuncDecl {
 		Recv: recv,
 		Name: ident,
 		Type: &ast.FuncType{
-			Func:     pos,
-			Params:   params,
-			ArrowPos: arrowPos,
-			Results:  results,
+			Func:       pos,
+			TypeParams: tparams,
+			Params:     params,
+			ArrowPos:   arrowPos,
+			Results:    results,
 		},
 		Body: body,
 	}
diff --git a/internal/printer/nodes.go b/internal/printer/nodes.go
@@ -1571,6 +1571,7 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {
 		} else {
 			p.print(vtab)
 		}
+		p.print(token.COLON)
 		p.expr(s.Type)
 		p.setComment(s.Comment)
 
diff --git a/waroot/examples/brainfuck.wa b/waroot/examples/brainfuck.wa
@@ -7,7 +7,7 @@ func main {
 	vm.Run()
 }
 
-type BrainFuck struct {
+type BrainFuck :struct {
 	mem:  [30000]byte
 	code: string
 	pos:  int
diff --git a/waroot/examples/brainfuck/src/bfpkg/brpkg.wa b/waroot/examples/brainfuck/src/bfpkg/brpkg.wa
@@ -1,7 +1,7 @@
 // 版权 @2022 凹语言 作者。保留所有权利。
 
 // BF 虚拟机
-type BrainFuck struct {
+type BrainFuck :struct {
 	mem:  [30000]byte
 	code: string
 	pos:  int
diff --git a/waroot/examples/eq.wa b/waroot/examples/eq.wa
@@ -1,6 +1,6 @@
 // 版权 @2021 凹语言 作者。保留所有权利。
 
-type T1 struct {
+type T1 :struct {
 	a: i32
 	b: string
 }
@@ -9,11 +9,11 @@ func T1.print {
 	println("a: ", this.a)
 }
 
-type I interface {
+type I :interface {
 	print()
 }
 
-type T2 struct {
+type T2 :struct {
 	a: []i32
 }
 
diff --git a/waroot/examples/expr/y.wa b/waroot/examples/expr/y.wa
@@ -6,7 +6,7 @@
 
 import "strconv" => __yystrconv__
 
-type exprSymType struct {
+type exprSymType :struct {
 	yys: int
 	num: int
 }
@@ -35,12 +35,12 @@ const exprInitialStackSize = 16
 // Lex 结束标志
 const eof = 0
 
-type exprToken struct {
+type exprToken :struct {
 	Kind:  int
 	Value: int
 }
 
-type exprLexer struct {
+type exprLexer :struct {
 	tokens: []exprToken
 	pos:    int
 }
@@ -143,7 +143,7 @@ global exprTok3 = [...]int{
 	0,
 }
 
-type exprErrorMessageInfo struct {
+type exprErrorMessageInfo :struct {
 	state: int
 	token: int
 	msg:   string
@@ -158,7 +158,7 @@ global (
 	exprErrorVerbose = false
 )
 
-type exprParser struct {
+type exprParser :struct {
 	lval:  exprSymType
 	stack: [exprInitialStackSize]exprSymType
 	char:  int
diff --git a/waroot/examples/interface_named.wa b/waroot/examples/interface_named.wa
@@ -1,18 +1,18 @@
 // 版权 @2021 凹语言 作者。保留所有权利。
 
-type T1 struct {
+type T1 :struct {
 	a: i32
 }
 
-type T2 struct {
+type T2 :struct {
 	b: i32
 }
 
-type I1 interface {
+type I1 :interface {
 	f()
 }
 
-type I2 interface {
+type I2 :interface {
 	f2()
 }
 
diff --git a/waroot/examples/life-game/src/life.wa b/waroot/examples/life-game/src/life.wa
@@ -40,7 +40,7 @@ func LifeInit(w, h, s: int) {
 	}
 }
 
-type DIR struct {
+type DIR :struct {
 	x: int
 	y: int
 }
diff --git a/waroot/examples/misc/closure.wa b/waroot/examples/misc/closure.wa
@@ -1,8 +1,8 @@
 // 版权 @2021 凹语言 作者。保留所有权利。
 
-type FP func(i: i32) => i32
+type FP :func(i: i32) => i32
 
-type ST struct {
+type ST :struct {
 	i: i32
 }
 
diff --git a/waroot/examples/misc/multi_ret.wa b/waroot/examples/misc/multi_ret.wa
@@ -14,6 +14,6 @@ func Swap(i, j: ST) => (ST, ST) {
 	return j, i
 }
 
-type ST struct {
+type ST :struct {
 	i, j: i32
 }
diff --git a/waroot/examples/misc/native_test_.wa b/waroot/examples/misc/native_test_.wa
@@ -146,7 +146,7 @@ func test_array(a: int, b: int) {
 	println("arr[", b, "][", a, "] = ", arr[b][a])
 }
 
-type t0 struct {
+type t0 :struct {
 	a: i64
 	b: i32
 	c: [4]f64
@@ -181,7 +181,7 @@ func test_struct1(a: int, b: int, c: int) {
 	}
 }
 
-type struct_t0 struct {
+type struct_t0 :struct {
 	arr0: [16]int
 	arr1: [16]f32
 }
@@ -234,7 +234,7 @@ func test_struct4 {
 	}
 }
 
-type fff32 f32
+type fff32 :f32
 
 global arr0: [32]fff32
 global arr1: [32]fff32
@@ -359,7 +359,7 @@ func test_global_consts() {
 	}
 }
 
-type ty0 struct {
+type ty0 :struct {
 	v0: int
 	v1: f64
 }
diff --git a/waroot/examples/misc/struct.wa b/waroot/examples/misc/struct.wa
@@ -10,11 +10,11 @@ func main {
 	println(j.b)
 }
 
-type sp struct {
+type sp :struct {
 	a: *i32
 }
 
-type sc struct {
+type sc :struct {
 	b: i32
 	sp
 }
diff --git a/waroot/examples/pkg/src/main.wa b/waroot/examples/pkg/src/main.wa
@@ -4,7 +4,7 @@ import (
 	"pkg/mypkg"
 )
 
-type ST struct {
+type ST :struct {
 	A: string
 	B: i32
 }
diff --git a/waroot/examples/pkg/src/mypkg/mypkg.wa b/waroot/examples/pkg/src/mypkg/mypkg.wa
@@ -1,6 +1,6 @@
 // 版权 @2022 hello 作者。保留所有权利。
 
-type ST struct {
+type ST :struct {
 	A: i32
 	B: string
 }
diff --git a/waroot/examples/snake/src/canvas/canvas.wa b/waroot/examples/snake/src/canvas/canvas.wa
@@ -17,19 +17,19 @@ buf为帧缓存指针
 func updateCanvas_JS(id: u32, buf: *u32)
 
 //画布事件回调函数原型
-type OnTouch func(x, y: u32)
-type OnKey func(key: u32)
+type OnTouch :func(x, y: u32)
+type OnKey :func(key: u32)
 
 //画布对象
-type Canvas struct {
+type Canvas :struct {
 	device_id: u32   //画布对象对应的网页DOM对象id
 	width:     u32   //画布宽度，以像素为单位
 	height:    u32   //画布高度，以像素为单位
 	frame_buf: []u32 //画布帧缓存，容量为Width * Height
 }
 
 //画布事件
-type CanvasEvents struct {
+type CanvasEvents :struct {
 	Device_id:   u32     //画布设备ID
 	OnMouseDown: OnTouch //鼠标按下时的回调处理函数
 	OnMouseUp:   OnTouch //鼠标松开时的回调处理函数
diff --git a/waroot/examples/snake/src/main.wa b/waroot/examples/snake/src/main.wa
@@ -17,7 +17,7 @@ func Canvas_OnKeyUp(id, key: u32) {
 	canvas.OnKeyUp(id, key)
 }
 
-type Position struct {
+type Position :struct {
 	x, y: i32
 }
 
@@ -41,7 +41,7 @@ const (
 
 global Dirs: [5]Position
 
-type GameState struct {
+type GameState :struct {
 	w, h:  i32
 	scale: i32
 	grid:  []u8
diff --git a/waroot/examples/struct.wa b/waroot/examples/struct.wa
@@ -30,11 +30,11 @@ func main {
 	println(Info.name, " ", Info.age) //李四 66
 }
 
-type sp struct {
+type sp :struct {
 	a: *i32
 }
 
-type sc struct {
+type sc :struct {
 	b: i32
 	sp
 }
diff --git a/waroot/src/hash/crc32/crc32.wa b/waroot/src/hash/crc32/crc32.wa
@@ -35,7 +35,7 @@ const (
 )
 
 // Table is a 256-word table representing the polynomial for efficient processing.
-type Table [256]uint32
+type Table :[256]uint32
 
 // This file makes use of functions implemented in architecture-specific files.
 // The interface that they implement is as follows:
@@ -148,7 +148,7 @@ func MakeTable(poly: uint32) => *Table {
 }
 
 // digest represents the partial evaluation of a checksum.
-type digest struct {
+type digest :struct {
 	crc: uint32
 	tab: *Table
 }
diff --git a/waroot/src/hash/crc32/crc32_generic.wa b/waroot/src/hash/crc32/crc32_generic.wa
@@ -47,7 +47,7 @@ func simpleUpdate(crc: uint32, tab: *Table, p: []byte) => uint32 {
 const slicing8Cutoff = 16
 
 // slicing8Table is array of 8 Tables, used by the slicing-by-8 algorithm.
-type slicing8Table [8]Table
+type slicing8Table :[8]Table
 
 // slicingMakeTable constructs a slicing8Table for the specified polynomial. The
 // table is suitable for use with the slicing-by-8 algorithm (slicingUpdate).
diff --git a/waroot/src/strings/replace.wa b/waroot/src/strings/replace.wa
diff --git a/waroot/src/strings/strings.wa b/waroot/src/strings/strings.wa

Original file line number	Diff line number	Diff line change
`@@ -1571,6 +1571,7 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {`
`1571`	`1571`	`} else {`
`1572`	`1572`	`p.print(vtab)`
`1573`	`1573`	`}`
	`1574`	`+ p.print(token.COLON)`
`1574`	`1575`	`p.expr(s.Type)`
`1575`	`1576`	`p.setComment(s.Comment)`
`1576`	`1577`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ func main {`
`7`	`7`	`vm.Run()`
`8`	`8`	`}`
`9`	`9`
`10`		`-type BrainFuck struct {`
	`10`	`+type BrainFuck :struct {`
`11`	`11`	`mem: [30000]byte`
`12`	`12`	`code: string`
`13`	`13`	`pos: int`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`// 版权 @2021 凹语言作者。保留所有权利。`
`2`	`2`
`3`		`-type T1 struct {`
	`3`	`+type T1 :struct {`
`4`	`4`	`a: i32`
`5`	`5`	`b: string`
`6`	`6`	`}`
`@@ -9,11 +9,11 @@ func T1.print {`
`9`	`9`	`println("a: ", this.a)`
`10`	`10`	`}`
`11`	`11`
`12`		`-type I interface {`
	`12`	`+type I :interface {`
`13`	`13`	`print()`
`14`	`14`	`}`
`15`	`15`
`16`		`-type T2 struct {`
	`16`	`+type T2 :struct {`
`17`	`17`	`a: []i32`
`18`	`18`	`}`
`19`	`19`
Original file line number	Diff line number	Diff line change
`@@ -1,18 +1,18 @@`
`1`	`1`	`// 版权 @2021 凹语言作者。保留所有权利。`
`2`	`2`
`3`		`-type T1 struct {`
	`3`	`+type T1 :struct {`
`4`	`4`	`a: i32`
`5`	`5`	`}`
`6`	`6`
`7`		`-type T2 struct {`
	`7`	`+type T2 :struct {`
`8`	`8`	`b: i32`
`9`	`9`	`}`
`10`	`10`
`11`		`-type I1 interface {`
	`11`	`+type I1 :interface {`
`12`	`12`	`f()`
`13`	`13`	`}`
`14`	`14`
`15`		`-type I2 interface {`
	`15`	`+type I2 :interface {`
`16`	`16`	`f2()`
`17`	`17`	`}`
`18`	`18`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func LifeInit(w, h, s: int) {`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`
`43`		`-type DIR struct {`
	`43`	`+type DIR :struct {`
`44`	`44`	`x: int`
`45`	`45`	`y: int`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`// 版权 @2021 凹语言作者。保留所有权利。`
`2`	`2`
`3`		`-type FP func(i: i32) => i32`
	`3`	`+type FP :func(i: i32) => i32`
`4`	`4`
`5`		`-type ST struct {`
	`5`	`+type ST :struct {`
`6`	`6`	`i: i32`
`7`	`7`	`}`
`8`	`8`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@ func Swap(i, j: ST) => (ST, ST) {`
`14`	`14`	`return j, i`
`15`	`15`	`}`
`16`	`16`
`17`		`-type ST struct {`
	`17`	`+type ST :struct {`
`18`	`18`	`i, j: i32`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ func test_array(a: int, b: int) {`
`146`	`146`	`println("arr[", b, "][", a, "] = ", arr[b][a])`
`147`	`147`	`}`
`148`	`148`
`149`		`-type t0 struct {`
	`149`	`+type t0 :struct {`
`150`	`150`	`a: i64`
`151`	`151`	`b: i32`
`152`	`152`	`c: [4]f64`
`@@ -181,7 +181,7 @@ func test_struct1(a: int, b: int, c: int) {`
`181`	`181`	`}`
`182`	`182`	`}`
`183`	`183`
`184`		`-type struct_t0 struct {`
	`184`	`+type struct_t0 :struct {`
`185`	`185`	`arr0: [16]int`
`186`	`186`	`arr1: [16]f32`
`187`	`187`	`}`
`@@ -234,7 +234,7 @@ func test_struct4 {`
`234`	`234`	`}`
`235`	`235`	`}`
`236`	`236`
`237`		`-type fff32 f32`
	`237`	`+type fff32 :f32`
`238`	`238`
`239`	`239`	`global arr0: [32]fff32`
`240`	`240`	`global arr1: [32]fff32`
`@@ -359,7 +359,7 @@ func test_global_consts() {`
`359`	`359`	`}`
`360`	`360`	`}`
`361`	`361`
`362`		`-type ty0 struct {`
	`362`	`+type ty0 :struct {`
`363`	`363`	`v0: int`
`364`	`364`	`v1: f64`
`365`	`365`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ func main {`
`10`	`10`	`println(j.b)`
`11`	`11`	`}`
`12`	`12`
`13`		`-type sp struct {`
	`13`	`+type sp :struct {`
`14`	`14`	`a: *i32`
`15`	`15`	`}`
`16`	`16`
`17`		`-type sc struct {`
	`17`	`+type sc :struct {`
`18`	`18`	`b: i32`
`19`	`19`	`sp`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"pkg/mypkg"`
`5`	`5`	`)`
`6`	`6`
`7`		`-type ST struct {`
	`7`	`+type ST :struct {`
`8`	`8`	`A: string`
`9`	`9`	`B: i32`
`10`	`10`	`}`