Partially implemented operator phrase commands

This commit is contained in:
Sasha Koshka 2022-09-03 11:34:13 -04:00
parent c2a8c4cd97
commit 1efd77acfe

View File

@ -38,6 +38,24 @@ var operatorTokens = []lexer.TokenKind {
lexer.TokenKindBinaryXorAssignment, lexer.TokenKindBinaryXorAssignment,
} }
// isTokenOperator returns whether or not the token is an operator token.
func isTokenOperator (token lexer.Token) (isOperator bool) {
for _, kind := range operatorTokens {
if token.Is(kind) {
isOperator = true
return
}
}
return
}
// validPhraseStartTokens lists all tokens that are expected when parsing the
// first part of a phrase.
var validPhraseStartTokens = append (
validArgumentStartTokens,
operatorTokens...)
// validBlockLevelPhraseTokens lists all tokens that are expected when parsing // validBlockLevelPhraseTokens lists all tokens that are expected when parsing
// a block level phrase. // a block level phrase.
var validBlockLevelPhraseTokens = append ( var validBlockLevelPhraseTokens = append (
@ -45,12 +63,6 @@ var validBlockLevelPhraseTokens = append (
lexer.TokenKindNewline, lexer.TokenKindNewline,
lexer.TokenKindReturnDirection) lexer.TokenKindReturnDirection)
// validBlockLevelPhraseCommandTokens is like validBlockLevelPhraseTokens, but
// specifically for the command argument.
var validBlockLevelPhraseCommandTokens = append (
validBlockLevelPhraseTokens,
operatorTokens...)
// validDelimitedPhraseTokens is like validBlockLevelPhraseTokens, but it also // validDelimitedPhraseTokens is like validBlockLevelPhraseTokens, but it also
// includes a right brace token. // includes a right brace token.
var validDelimitedPhraseTokens = append ( var validDelimitedPhraseTokens = append (
@ -60,11 +72,6 @@ var validDelimitedPhraseTokens = append (
lexer.TokenKindRBracket, lexer.TokenKindRBracket,
lexer.TokenKindReturnDirection) lexer.TokenKindReturnDirection)
// validDelimitedPhraseCommandTokens is like validDelimitedPhraseTokens, but
// specifically for the command argument.
var validDelimitedPhraseCommand = append (
validDelimitedPhraseTokens,
operatorTokens...)
// controlFlowNames contains a list of all command names that must have a block // controlFlowNames contains a list of all command names that must have a block
// underneath them. // underneath them.
@ -306,7 +313,7 @@ func (parser *ParsingOperation) parseBlockLevelPhrase (
) { ) {
if !parser.token.Is(lexer.TokenKindIndent) { return } if !parser.token.Is(lexer.TokenKindIndent) { return }
if parser.token.Value().(int) != indent { return } if parser.token.Value().(int) != indent { return }
err = parser.nextToken(validArgumentStartTokens...) err = parser.nextToken(validPhraseStartTokens...)
if err != nil { return } if err != nil { return }
expectRightBracket := false expectRightBracket := false
@ -317,10 +324,15 @@ func (parser *ParsingOperation) parseBlockLevelPhrase (
} }
// get command // get command
err = parser.expect(validArgumentStartTokens...) err = parser.expect(validPhraseStartTokens...)
if err != nil { return }
phrase.command, err = parser.parseArgument()
if err != nil { return } if err != nil { return }
if isTokenOperator(parser.token) {
phrase.command, err = parser.parseOperatorArgument()
if err != nil { return }
} else {
phrase.command, err = parser.parseArgument()
if err != nil { return }
}
for { for {
if expectRightBracket { if expectRightBracket {
@ -366,7 +378,6 @@ func (parser *ParsingOperation) parseBlockLevelPhrase (
} }
} }
// this is an argument // this is an argument
var argument Argument var argument Argument
argument, err = parser.parseArgument() argument, err = parser.parseArgument()
@ -394,10 +405,15 @@ func (parser *ParsingOperation) parseArgumentLevelPhrase () (
if err != nil { return } if err != nil { return }
// get command // get command
err = parser.nextToken(validArgumentStartTokens...) err = parser.nextToken(validPhraseStartTokens...)
if err != nil { return }
phrase.command, err = parser.parseArgument()
if err != nil { return } if err != nil { return }
if isTokenOperator(parser.token) {
phrase.command, err = parser.parseOperatorArgument()
if err != nil { return }
} else {
phrase.command, err = parser.parseArgument()
if err != nil { return }
}
for { for {
// delimited // delimited
@ -432,3 +448,20 @@ func (parser *ParsingOperation) parseArgumentLevelPhrase () (
phrase.arguments = append(phrase.arguments, argument) phrase.arguments = append(phrase.arguments, argument)
} }
} }
// parseOperatorArgument parses an operator argument. This is only used to parse
// operator phrase commands.
func (parser *ParsingOperation) parseOperatorArgument () (
operator Argument,
err error,
) {
err = parser.expect(operatorTokens...)
if err != nil { return }
operator.location = parser.token.Location()
operator.kind = ArgumentKindOperator
operator.value = parser.token.Kind()
err = parser.nextToken()
return
}