feat: support and & or boolean operators

saffage · May 7, 2024 · ab27de0 · ab27de0
1 parent a24d20f
commit ab27de0
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 9 deletions.
diff --git a/ast/operator_kind.go b/ast/operator_kind.go
@@ -34,6 +34,8 @@ const (
 	OperatorBitXor // ^
 	OperatorBitShl // <<
 	OperatorBitShr // >>
+	OperatorAnd    // and
+	OperatorOr     // or
 
 	// Postfix.
 

diff --git a/ast/operator_kind_string.go b/ast/operator_kind_string.go
diff --git a/checker/type_resolver.go b/checker/type_resolver.go
@@ -414,6 +414,15 @@ func (check *Checker) typeOfInfixOp(node *ast.InfixOp) types.Type {
 				return types.Primitives[types.Bool]
 			}
 
+		case ast.OperatorAnd, ast.OperatorOr:
+			switch primitive.Kind() {
+			case types.UntypedBool:
+				return types.Primitives[types.UntypedBool]
+
+			case types.Bool:
+				return types.Primitives[types.Bool]
+			}
+
 		default:
 			panic("unreachable")
 		}

diff --git a/parser/parse_ast.go b/parser/parse_ast.go
@@ -257,10 +257,16 @@ func (p *Parser) parseBinaryExpr(lhs ast.Node, precedence token.Precedence) ast.
 
 		case token.Shl:
 			binaryOpKind = ast.OperatorBitShl
-		case token.Shr:
 
+		case token.Shr:
 			binaryOpKind = ast.OperatorBitShr
 
+		case token.KwAnd:
+			binaryOpKind = ast.OperatorAnd
+
+		case token.KwOr:
+			binaryOpKind = ast.OperatorOr
+
 		default:
 			p.errorf(
 				tok.Start,

diff --git a/token/kind.go b/token/kind.go
@@ -89,6 +89,8 @@ const (
 	KwReturn   // keyword 'return'
 	KwBreak    // keyword 'break'
 	KwContinue // keyword 'continue'
+	KwAnd      // keyword 'and'
+	KwOr       // keyword 'or'
 )
 
 const (
@@ -241,4 +243,6 @@ var representableKinds = map[Kind]string{
 	KwReturn:     "return",
 	KwBreak:      "break",
 	KwContinue:   "continue",
+	KwAnd:        "and",
+	KwOr:         "or",
 }
diff --git a/token/kind_string.go b/token/kind_string.go
diff --git a/token/kind_user_string.go b/token/kind_user_string.go
diff --git a/token/token.go b/token/token.go
@@ -20,6 +20,7 @@ const (
 	LowestPrec Precedence = iota
 	AssignPrec
 	ArrowPrec
+	BooleanOpPrec
 	BitwisePrec
 	CmpPrec
 	ShiftPrec
@@ -69,6 +70,9 @@ func (t Token) Precedence() Precedence {
 	case EqOp, NeOp, LtOp, GtOp, LeOp, GeOp:
 		return CmpPrec
 
+	case KwAnd, KwOr:
+		return BooleanOpPrec
+
 	case Arrow, FatArrow, Dot2, Dot2Less:
 		return ArrowPrec