diff --git a/lang/token/list.go b/lang/token/list.go index fa29764b..08914a08 100644 --- a/lang/token/list.go +++ b/lang/token/list.go @@ -34,20 +34,22 @@ const ( type Key uint32 const ( - idShift = 14 - idMask = 1<<14 - 1 - maxKey = 1<<18 - 1 + FlagsBits = 14 + FlagsMask = 1<>idShift)] } -func (x ID) BinaryForm() ID { return binaryForms[0xFF&(x>>idShift)] } -func (x ID) AssociativeForm() ID { return associativeForms[0xFF&(x>>idShift)] } +func (x ID) UnaryForm() ID { return unaryForms[0xFF&(x>>KeyShift)] } +func (x ID) BinaryForm() ID { return binaryForms[0xFF&(x>>KeyShift)] } +func (x ID) AssociativeForm() ID { return associativeForms[0xFF&(x>>KeyShift)] } -func (x ID) Key() Key { return Key(x >> idShift) } -func (x ID) Flags() Flags { return Flags(x & idMask) } +func (x ID) Key() Key { return Key(x >> KeyShift) } +func (x ID) Flags() Flags { return Flags(x & FlagsMask) } func (x ID) IsUnaryOp() bool { return Flags(x)&FlagsUnaryOp != 0 } func (x ID) IsBinaryOp() bool { return Flags(x)&FlagsBinaryOp != 0 } @@ -69,8 +71,8 @@ type Token struct { Line uint32 } -func (t Token) Key() Key { return Key(t.ID >> idShift) } -func (t Token) Flags() Flags { return Flags(t.ID & idMask) } +func (t Token) Key() Key { return Key(t.ID >> KeyShift) } +func (t Token) Flags() Flags { return Flags(t.ID & FlagsMask) } func (t Token) IsUnaryOp() bool { return Flags(t.ID)&FlagsUnaryOp != 0 } func (t Token) IsBinaryOp() bool { return Flags(t.ID)&FlagsBinaryOp != 0 } @@ -103,86 +105,86 @@ const nBuiltInKeys = 256 const ( IDInvalid = ID(0) - IDOpenParen = ID(0x10<> idShift: {"(", IDOpenParen}, - IDCloseParen >> idShift: {")", IDCloseParen}, - IDOpenBracket >> idShift: {"[", IDOpenBracket}, - IDCloseBracket >> idShift: {"]", IDCloseBracket}, - IDOpenCurly >> idShift: {"{", IDOpenCurly}, - IDCloseCurly >> idShift: {"}", IDCloseCurly}, + IDOpenParen >> KeyShift: {"(", IDOpenParen}, + IDCloseParen >> KeyShift: {")", IDCloseParen}, + IDOpenBracket >> KeyShift: {"[", IDOpenBracket}, + IDCloseBracket >> KeyShift: {"]", IDCloseBracket}, + IDOpenCurly >> KeyShift: {"{", IDOpenCurly}, + IDCloseCurly >> KeyShift: {"}", IDCloseCurly}, - IDDot >> idShift: {".", IDDot}, - IDComma >> idShift: {",", IDComma}, - IDQuestion >> idShift: {"?", IDQuestion}, - IDColon >> idShift: {":", IDColon}, - IDSemicolon >> idShift: {";", IDSemicolon}, + IDDot >> KeyShift: {".", IDDot}, + IDComma >> KeyShift: {",", IDComma}, + IDQuestion >> KeyShift: {"?", IDQuestion}, + IDColon >> KeyShift: {":", IDColon}, + IDSemicolon >> KeyShift: {";", IDSemicolon}, - IDEq >> idShift: {"=", IDEq}, - IDPlusEq >> idShift: {"+=", IDPlusEq}, - IDMinusEq >> idShift: {"-=", IDMinusEq}, - IDStarEq >> idShift: {"*=", IDStarEq}, - IDSlashEq >> idShift: {"/=", IDSlashEq}, - IDShiftLEq >> idShift: {"<<=", IDShiftLEq}, - IDShiftREq >> idShift: {">>=", IDShiftREq}, - IDAmpEq >> idShift: {"&=", IDAmpEq}, - IDAmpHatEq >> idShift: {"&^=", IDAmpHatEq}, - IDPipeEq >> idShift: {"|=", IDPipeEq}, - IDHatEq >> idShift: {"^=", IDHatEq}, + IDEq >> KeyShift: {"=", IDEq}, + IDPlusEq >> KeyShift: {"+=", IDPlusEq}, + IDMinusEq >> KeyShift: {"-=", IDMinusEq}, + IDStarEq >> KeyShift: {"*=", IDStarEq}, + IDSlashEq >> KeyShift: {"/=", IDSlashEq}, + IDShiftLEq >> KeyShift: {"<<=", IDShiftLEq}, + IDShiftREq >> KeyShift: {">>=", IDShiftREq}, + IDAmpEq >> KeyShift: {"&=", IDAmpEq}, + IDAmpHatEq >> KeyShift: {"&^=", IDAmpHatEq}, + IDPipeEq >> KeyShift: {"|=", IDPipeEq}, + IDHatEq >> KeyShift: {"^=", IDHatEq}, - IDPlus >> idShift: {"+", IDPlus}, - IDMinus >> idShift: {"-", IDMinus}, - IDStar >> idShift: {"*", IDStar}, - IDSlash >> idShift: {"/", IDSlash}, - IDShiftL >> idShift: {"<<", IDShiftL}, - IDShiftR >> idShift: {">>", IDShiftR}, - IDAmp >> idShift: {"&", IDAmp}, - IDAmpHat >> idShift: {"&^", IDAmpHat}, - IDPipe >> idShift: {"|", IDPipe}, - IDHat >> idShift: {"^", IDHat}, + IDPlus >> KeyShift: {"+", IDPlus}, + IDMinus >> KeyShift: {"-", IDMinus}, + IDStar >> KeyShift: {"*", IDStar}, + IDSlash >> KeyShift: {"/", IDSlash}, + IDShiftL >> KeyShift: {"<<", IDShiftL}, + IDShiftR >> KeyShift: {">>", IDShiftR}, + IDAmp >> KeyShift: {"&", IDAmp}, + IDAmpHat >> KeyShift: {"&^", IDAmpHat}, + IDPipe >> KeyShift: {"|", IDPipe}, + IDHat >> KeyShift: {"^", IDHat}, - IDNotEq >> idShift: {"!=", IDNotEq}, - IDLessThan >> idShift: {"<", IDLessThan}, - IDLessEq >> idShift: {"<=", IDLessEq}, - IDEqEq >> idShift: {"==", IDEqEq}, - IDGreaterEq >> idShift: {">=", IDGreaterEq}, - IDGreaterThan >> idShift: {">", IDGreaterThan}, + IDNotEq >> KeyShift: {"!=", IDNotEq}, + IDLessThan >> KeyShift: {"<", IDLessThan}, + IDLessEq >> KeyShift: {"<=", IDLessEq}, + IDEqEq >> KeyShift: {"==", IDEqEq}, + IDGreaterEq >> KeyShift: {">=", IDGreaterEq}, + IDGreaterThan >> KeyShift: {">", IDGreaterThan}, - IDAnd >> idShift: {"and", IDAnd}, - IDOr >> idShift: {"or", IDOr}, - IDNot >> idShift: {"not", IDNot}, - IDAs >> idShift: {"as", IDAs}, + IDAnd >> KeyShift: {"and", IDAnd}, + IDOr >> KeyShift: {"or", IDOr}, + IDNot >> KeyShift: {"not", IDNot}, + IDAs >> KeyShift: {"as", IDAs}, - IDFunc >> idShift: {"func", IDFunc}, - IDPtr >> idShift: {"ptr", IDPtr}, - IDAssert >> idShift: {"assert", IDAssert}, - IDFor >> idShift: {"for", IDFor}, - IDIf >> idShift: {"if", IDIf}, - IDElse >> idShift: {"else", IDElse}, - IDReturn >> idShift: {"return", IDReturn}, - IDBreak >> idShift: {"break", IDBreak}, - IDContinue >> idShift: {"continue", IDContinue}, - IDStruct >> idShift: {"struct", IDStruct}, - IDUse >> idShift: {"use", IDUse}, + IDFunc >> KeyShift: {"func", IDFunc}, + IDPtr >> KeyShift: {"ptr", IDPtr}, + IDAssert >> KeyShift: {"assert", IDAssert}, + IDFor >> KeyShift: {"for", IDFor}, + IDIf >> KeyShift: {"if", IDIf}, + IDElse >> KeyShift: {"else", IDElse}, + IDReturn >> KeyShift: {"return", IDReturn}, + IDBreak >> KeyShift: {"break", IDBreak}, + IDContinue >> KeyShift: {"continue", IDContinue}, + IDStruct >> KeyShift: {"struct", IDStruct}, + IDUse >> KeyShift: {"use", IDUse}, - IDFalse >> idShift: {"false", IDFalse}, - IDTrue >> idShift: {"true", IDTrue}, + IDFalse >> KeyShift: {"false", IDFalse}, + IDTrue >> KeyShift: {"true", IDTrue}, - IDI8 >> idShift: {"i8", IDI8}, - IDI16 >> idShift: {"i16", IDI16}, - IDI32 >> idShift: {"i32", IDI32}, - IDI64 >> idShift: {"i64", IDI64}, - IDU8 >> idShift: {"u8", IDU8}, - IDU16 >> idShift: {"u16", IDU16}, - IDU32 >> idShift: {"u32", IDU32}, - IDU64 >> idShift: {"u64", IDU64}, - IDUsize >> idShift: {"usize", IDUsize}, - IDBool >> idShift: {"bool", IDBool}, - IDBuf1 >> idShift: {"buf1", IDBuf1}, - IDBuf2 >> idShift: {"buf2", IDBuf2}, + IDI8 >> KeyShift: {"i8", IDI8}, + IDI16 >> KeyShift: {"i16", IDI16}, + IDI32 >> KeyShift: {"i32", IDI32}, + IDI64 >> KeyShift: {"i64", IDI64}, + IDU8 >> KeyShift: {"u8", IDU8}, + IDU16 >> KeyShift: {"u16", IDU16}, + IDU32 >> KeyShift: {"u32", IDU32}, + IDU64 >> KeyShift: {"u64", IDU64}, + IDUsize >> KeyShift: {"usize", IDUsize}, + IDBool >> KeyShift: {"bool", IDBool}, + IDBuf1 >> KeyShift: {"buf1", IDBuf1}, + IDBuf2 >> KeyShift: {"buf2", IDBuf2}, - IDUnderscore >> idShift: {"_", IDUnderscore}, - IDThis >> idShift: {"this", IDThis}, + IDUnderscore >> KeyShift: {"_", IDUnderscore}, + IDThis >> KeyShift: {"this", IDThis}, } var builtInsByName = map[string]ID{} @@ -333,19 +335,19 @@ var squiggles = [256]ID{ ':': IDColon, ';': IDSemicolon, - // 1<': 1 << idShift, + '&': 1 << KeyShift, + '|': 1 << KeyShift, + '^': 1 << KeyShift, + '+': 1 << KeyShift, + '-': 1 << KeyShift, + '*': 1 << KeyShift, + '/': 1 << KeyShift, + '=': 1 << KeyShift, + '<': 1 << KeyShift, + '>': 1 << KeyShift, } type suffixLexer struct { @@ -411,39 +413,39 @@ var lexers = [256][]suffixLexer{ } var unaryForms = [256]ID{ - IDPlus >> idShift: IDXUnaryPlus, - IDMinus >> idShift: IDXUnaryMinus, - IDNot >> idShift: IDXUnaryNot, + IDPlus >> KeyShift: IDXUnaryPlus, + IDMinus >> KeyShift: IDXUnaryMinus, + IDNot >> KeyShift: IDXUnaryNot, } var binaryForms = [256]ID{ - IDPlus >> idShift: IDXBinaryPlus, - IDMinus >> idShift: IDXBinaryMinus, - IDStar >> idShift: IDXBinaryStar, - IDSlash >> idShift: IDXBinarySlash, - IDShiftL >> idShift: IDXBinaryShiftL, - IDShiftR >> idShift: IDXBinaryShiftR, - IDAmp >> idShift: IDXBinaryAmp, - IDAmpHat >> idShift: IDXBinaryAmpHat, - IDPipe >> idShift: IDXBinaryPipe, - IDHat >> idShift: IDXBinaryHat, - IDNotEq >> idShift: IDXBinaryNotEq, - IDLessThan >> idShift: IDXBinaryLessThan, - IDLessEq >> idShift: IDXBinaryLessEq, - IDEqEq >> idShift: IDXBinaryEqEq, - IDGreaterEq >> idShift: IDXBinaryGreaterEq, - IDGreaterThan >> idShift: IDXBinaryGreaterThan, - IDAnd >> idShift: IDXBinaryAnd, - IDOr >> idShift: IDXBinaryOr, - IDAs >> idShift: IDXBinaryAs, + IDPlus >> KeyShift: IDXBinaryPlus, + IDMinus >> KeyShift: IDXBinaryMinus, + IDStar >> KeyShift: IDXBinaryStar, + IDSlash >> KeyShift: IDXBinarySlash, + IDShiftL >> KeyShift: IDXBinaryShiftL, + IDShiftR >> KeyShift: IDXBinaryShiftR, + IDAmp >> KeyShift: IDXBinaryAmp, + IDAmpHat >> KeyShift: IDXBinaryAmpHat, + IDPipe >> KeyShift: IDXBinaryPipe, + IDHat >> KeyShift: IDXBinaryHat, + IDNotEq >> KeyShift: IDXBinaryNotEq, + IDLessThan >> KeyShift: IDXBinaryLessThan, + IDLessEq >> KeyShift: IDXBinaryLessEq, + IDEqEq >> KeyShift: IDXBinaryEqEq, + IDGreaterEq >> KeyShift: IDXBinaryGreaterEq, + IDGreaterThan >> KeyShift: IDXBinaryGreaterThan, + IDAnd >> KeyShift: IDXBinaryAnd, + IDOr >> KeyShift: IDXBinaryOr, + IDAs >> KeyShift: IDXBinaryAs, } var associativeForms = [256]ID{ - IDPlus >> idShift: IDXAssociativePlus, - IDStar >> idShift: IDXAssociativeStar, - IDAmp >> idShift: IDXAssociativeAmp, - IDPipe >> idShift: IDXAssociativePipe, - IDHat >> idShift: IDXAssociativeHat, - IDAnd >> idShift: IDXAssociativeAnd, - IDOr >> idShift: IDXAssociativeOr, + IDPlus >> KeyShift: IDXAssociativePlus, + IDStar >> KeyShift: IDXAssociativeStar, + IDAmp >> KeyShift: IDXAssociativeAmp, + IDPipe >> KeyShift: IDXAssociativePipe, + IDHat >> KeyShift: IDXAssociativeHat, + IDAnd >> KeyShift: IDXAssociativeAnd, + IDOr >> KeyShift: IDXAssociativeOr, } diff --git a/lang/token/token.go b/lang/token/token.go index e2c644df..e6f78f3a 100644 --- a/lang/token/token.go +++ b/lang/token/token.go @@ -44,7 +44,7 @@ func (m *IDMap) insert(name string) (ID, error) { } else { flags |= FlagsIdent } - id := ID(key<