parser 禁止类型别名

wa-lang · Jan 12, 2024 · 7ed7e83 · 7ed7e83
1 parent 06c3e74
commit 7ed7e83
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 17 deletions.
diff --git a/internal/ast/ast.go b/internal/ast/ast.go
@@ -790,7 +790,6 @@ type (
 		Name       *Ident        // type name
 		TypeParams *FieldList    // type parameters; or nil
 		ColonPos   token.Pos     // position of ":" operator (token.NoPos if there is no ":")
-		Assign     token.Pos     // position of '=', if any
 		Type       Expr          // *Ident, *ParenExpr, *SelectorExpr, *StarExpr, or any of the *XxxTypes
 		Comment    *CommentGroup // line comments; or nil
 	}

diff --git a/internal/frontend/wz/parser/parser.go b/internal/frontend/wz/parser/parser.go
@@ -2432,9 +2432,6 @@ func (p *parser) parseTypeSpec(doc *ast.CommentGroup, _ token.Token, _ int) ast.
 	if p.tok == token.COLON {
 		spec.ColonPos = p.pos
 		p.next()
-	} else if p.tok == token.ASSIGN {
-		spec.Assign = p.pos
-		p.next()
 	}
 	spec.Type = p.parseType()
 	p.expectSemi() // call before accessing p.linecomment
@@ -2890,9 +2887,6 @@ func (p *parser) 解析类型定义() *ast.GenDecl {
 	if p.tok == token.COLON {
 		spec.ColonPos = p.pos
 		p.next()
-	} else if p.tok == token.ASSIGN {
-		spec.Assign = p.pos
-		p.next()
 	}
 	// spec.Type = p.parseType()
 

diff --git a/internal/parser/parser.go b/internal/parser/parser.go
@@ -2443,9 +2443,6 @@ func (p *parser) parseTypeSpec(doc *ast.CommentGroup, _ token.Token, _ int) ast.
 	if p.tok == token.COLON {
 		spec.ColonPos = p.pos
 		p.next()
-	} else if p.tok == token.ASSIGN {
-		spec.Assign = p.pos
-		p.next()
 	}
 	spec.Type = p.parseType()
 	p.expectSemi() // call before accessing p.linecomment

diff --git a/internal/printer/nodes.go b/internal/printer/nodes.go
@@ -1571,9 +1571,6 @@ func (p *printer) spec(spec ast.Spec, n int, doIndent bool) {
 		} else {
 			p.print(vtab)
 		}
-		if s.Assign.IsValid() {
-			p.print(token.ASSIGN, blank)
-		}
 		p.expr(s.Type)
 		p.setComment(s.Comment)
 

diff --git a/internal/types/decl.go b/internal/types/decl.go
@@ -39,7 +39,8 @@ func (check *Checker) declare(scope *Scope, id *ast.Ident, obj Object, pos token
 
 // pathString returns a string of the form a->b-> ... ->g for a path [a, b, ... g].
 // TODO(gri) remove once we don't need the old cycle detection (explicitly passed
-//           []*TypeName path) anymore
+//
+//	[]*TypeName path) anymore
 func pathString(path []*TypeName) string {
 	var s string
 	for i, p := range path {
@@ -682,7 +683,7 @@ func (check *Checker) declStmt(decl ast.Decl) {
 				check.declare(check.scope, s.Name, obj, scopePos)
 				// mark and unmark type before calling typeDecl; its type is still nil (see Checker.objDecl)
 				obj.setColor(grey + color(check.push(obj)))
-				check.typeDecl(obj, s.Type, nil, s.Assign.IsValid())
+				check.typeDecl(obj, s.Type, nil, false)
 				check.pop().setColor(black)
 			default:
 				check.invalidAST(s.Pos(), "const, type, or var declaration expected")

diff --git a/internal/types/resolver.go b/internal/types/resolver.go
@@ -404,7 +404,7 @@ func (check *Checker) collectObjects() {
 					case *ast.TypeSpec:
 						obj := NewTypeName(s.Name.Pos(), pkg, s.Name.Name, nil)
 						obj.setNode(s)
-						check.declarePkgObj(s.Name, obj, &declInfo{file: fileScope, typ: s.Type, alias: s.Assign.IsValid()})
+						check.declarePkgObj(s.Name, obj, &declInfo{file: fileScope, typ: s.Type, alias: false})
 
 						if s.Doc == nil {
 							if d.Lparen == token.NoPos && d.Doc != nil {

diff --git a/waroot/changelog.md b/waroot/changelog.md
@@ -1,6 +1,7 @@
 # 版本日志
 
 - (dev)
+  - 禁止类型别名
 - v0.9.0 (2023-12-15) MVP
   - 增加胶水代码定义特性
   - 添加 js、js/cancas 标准库

diff --git a/waroot/src/math/bits/bits_test.wa b/waroot/src/math/bits/bits_test.wa
@@ -5,7 +5,7 @@
 
 const DeBruijn64 = deBruijn64
 
-type entry = struct {
+type entry struct {
 	nlz, ntz, pop: int
 }