diff --git a/src/Language/MiniPython/Assignment.hs b/src/Language/MiniPython/Assignment.hs index 3adc16c14..1b4be242e 100644 --- a/src/Language/MiniPython/Assignment.hs +++ b/src/Language/MiniPython/Assignment.hs @@ -110,7 +110,7 @@ binaryOperator = makeTerm' <$> symbol BinaryOperator <*> children (infixTerm exp ]) identifier :: Assignment Term -identifier = makeTerm <$> (symbol Identifier <|> symbol Identifier' <|> symbol DottedName) <*> (Syntax.Identifier . name <$> source) +identifier = makeTerm <$> (symbol Identifier <|> symbol DottedName) <*> (Syntax.Identifier . name <$> source) integer :: Assignment Term integer = makeTerm <$> symbol Integer <*> (Literal.Integer <$> source) diff --git a/src/Language/Python/Assignment.hs b/src/Language/Python/Assignment.hs index d740b5bbe..412cef0fb 100644 --- a/src/Language/Python/Assignment.hs +++ b/src/Language/Python/Assignment.hs @@ -375,7 +375,7 @@ yield :: Assignment Term yield = makeTerm <$> symbol Yield <*> (Statement.Yield <$> children (term ( expression <|> emptyTerm ))) identifier :: Assignment Term -identifier = makeTerm <$> (symbol Identifier <|> symbol Identifier' <|> symbol DottedName) <*> (Syntax.Identifier . name <$> source) +identifier = makeTerm <$> (symbol Identifier <|> symbol DottedName) <*> (Syntax.Identifier . name <$> source) set :: Assignment Term set = makeTerm <$> symbol Set <*> children (Literal.Set <$> manyTerm expression) @@ -414,7 +414,7 @@ import' = makeTerm'' <$> symbol ImportStatement <*> children (manyTerm (aliase -- `import a` plainImport = makeTerm <$> symbol DottedName <*> children (Python.Syntax.QualifiedImport <$> NonEmpty.some1 identifier) -- `from a import foo ` - importSymbol = makeNameAliasPair <$> (symbol Identifier <|> symbol Identifier' <|> symbol DottedName) <*> (mkIdentifier <$> location <*> source) + importSymbol = makeNameAliasPair <$> (symbol Identifier <|> symbol DottedName) <*> (mkIdentifier <$> location <*> source) -- `from a import foo as bar` aliasImportSymbol = makeTerm <$> symbol AliasedImport <*> children (Python.Syntax.Alias <$> identifier <*> identifier) -- `from a import *` @@ -424,7 +424,7 @@ import' = makeTerm'' <$> symbol ImportStatement <*> children (manyTerm (aliase importDottedName = symbol DottedName *> children (qualifiedName <$> NonEmpty.some1 identifierSource) importRelative = symbol RelativeImport *> children (relativeQualifiedName <$> importPrefix <*> ((symbol DottedName *> children (many identifierSource)) <|> pure [])) importPrefix = symbol ImportPrefix *> source - identifierSource = (symbol Identifier <|> symbol Identifier') *> source + identifierSource = symbol Identifier *> source makeNameAliasPair location alias = makeTerm location (Python.Syntax.Alias alias alias) mkIdentifier location source = makeTerm location (Syntax.Identifier (name source)) diff --git a/vendor/haskell-tree-sitter b/vendor/haskell-tree-sitter index de469907a..53dbe815f 160000 --- a/vendor/haskell-tree-sitter +++ b/vendor/haskell-tree-sitter @@ -1 +1 @@ -Subproject commit de469907a0fcd4d522a880c985e533e7849ff8b5 +Subproject commit 53dbe815fd85726484294833dfaece544d5f423d