mirror of
https://github.com/ddidderr/wuffs.git
synced 2026-11-17 16:32:11 +01:00
Reserve the "ideal" name.
Also reject using built-in names as struct or func names.
This commit is contained in:
1 parent
567e6f7459
commit
a8a246be7c
3 files changed
+17
-8
No files matched your search
+3
-8
@@ -12,18 +12,13 @@ import (
|
||||
t "github.com/google/puffs/lang/token"
|
||||
)
|
||||
|
||||
// DummyTypeIdealNumber is an a.Node.MType field that means that n is an ideal
|
||||
// numeric constant.
|
||||
//
|
||||
// TODO: change 1 to a named constant.
|
||||
var DummyTypeIdealNumber = a.NewTypeExpr(0, 1, nil, nil, nil)
|
||||
// DummyTypeIdealNumber is an *ast.Node MType (implicit type) that means that n
|
||||
// is an ideal numeric constant.
|
||||
var DummyTypeIdealNumber = a.NewTypeExpr(0, t.IDIdeal, nil, nil, nil)
|
||||
|
||||
// TypeString returns a string form of the type n.
|
||||
func TypeString(m *t.IDMap, n *a.TypeExpr) string {
|
||||
if n != nil {
|
||||
if n == DummyTypeIdealNumber {
|
||||
return "!ideal!"
|
||||
}
|
||||
switch n.PackageOrDecorator() {
|
||||
case 0:
|
||||
return m.ByID(n.Name())
|
||||
|
||||
@@ -67,6 +67,14 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if id0 != 0 && id0.IsBuiltIn() {
|
||||
return nil, fmt.Errorf("parse: built-in %q used for func receiver at %s:%d",
|
||||
p.m.ByID(id0), p.filename, p.line())
|
||||
}
|
||||
if id1.IsBuiltIn() {
|
||||
return nil, fmt.Errorf("parse: built-in %q used for func name at %s:%d",
|
||||
p.m.ByID(id1), p.filename, p.line())
|
||||
}
|
||||
if p.peekID() == t.IDQuestion {
|
||||
flags |= a.FlagsSuspendible
|
||||
p.src = p.src[1:]
|
||||
@@ -97,6 +105,10 @@ func (p *parser) parseTopLevelDecl() (*a.Node, error) {
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if name.IsBuiltIn() {
|
||||
return nil, fmt.Errorf("parse: built-in %q used for struct name at %s:%d",
|
||||
p.m.ByID(name), p.filename, p.line())
|
||||
}
|
||||
if p.peekID() == t.IDQuestion {
|
||||
flags |= a.FlagsSuspendible
|
||||
p.src = p.src[1:]
|
||||
|
||||
@@ -179,6 +179,7 @@ const (
|
||||
IDStruct = ID(0x69<<KeyShift | FlagsOther)
|
||||
IDUse = ID(0x6A<<KeyShift | FlagsOther)
|
||||
IDVar = ID(0x6B<<KeyShift | FlagsOther)
|
||||
IDIdeal = ID(0x6C<<KeyShift | FlagsOther)
|
||||
|
||||
IDFalse = ID(0x90<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
|
||||
IDTrue = ID(0x91<<KeyShift | FlagsLiteral | FlagsImplicitSemicolon)
|
||||
@@ -303,6 +304,7 @@ var builtInsByKey = [nBuiltInKeys]struct {
|
||||
IDStruct >> KeyShift: {"struct", IDStruct},
|
||||
IDUse >> KeyShift: {"use", IDUse},
|
||||
IDVar >> KeyShift: {"var", IDVar},
|
||||
IDIdeal >> KeyShift: {"ideal", IDIdeal},
|
||||
|
||||
IDFalse >> KeyShift: {"false", IDFalse},
|
||||
IDTrue >> KeyShift: {"true", IDTrue},
|
||||
|
||||
Reference in new issue
Block a user