Skip to content

Commit ddc6d91

Browse files
committed
delete nextmatcher
1 parent c596ccf commit ddc6d91

File tree

3 files changed

+1
-35
lines changed

3 files changed

+1
-35
lines changed

elisp/egison-mode.el

+1-10
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,6 @@
7474
"\\<match-lambda\\>"
7575
"\\<match-all\\>"
7676
"\\<match-all-lambda\\>"
77-
"\\<next-match\\>"
78-
"\\<next-match-lambda\\>"
79-
"\\<next-match-all\\>"
80-
"\\<next-match-all-lambda\\>"
81-
"\\<next-matcher\\>"
8277
"\\<matcher\\>"
8378
"\\<self\\>"
8479
"\\<algebraic-data-matcher\\>"
@@ -90,7 +85,7 @@
9085

9186
"\\<undefined\\>"
9287
"\\<something\\>"
93-
88+
9489
"\\\.\\\.\\\."
9590
"\\\,"
9691
; "'"
@@ -202,10 +197,6 @@
202197
((equal "match-lambda" name) 2)
203198
((equal "match-all" name) 2)
204199
((equal "match-all-lambda" name) 2)
205-
((equal "next-match" name) 2)
206-
((equal "next-match-lambda" name) 2)
207-
((equal "next-match-all" name) 2)
208-
((equal "next-match-all-lambda" name) 2)
209200
((equal "matcher" name) 2)
210201
((equal "algebraic-data-matcher" name) 2)
211202
((equal "pattern-function" name) 2)

hs-src/Language/Egison/Parser.hs

-20
Original file line numberDiff line numberDiff line change
@@ -230,10 +230,6 @@ expr' = (try partialExpr
230230
<|> matchExpr
231231
<|> matchAllLambdaExpr
232232
<|> matchLambdaExpr
233-
<|> nextMatchAllExpr
234-
<|> nextMatchExpr
235-
<|> nextMatchAllLambdaExpr
236-
<|> nextMatchLambdaExpr
237233
<|> matcherExpr
238234
<|> matcherDFSExpr
239235
<|> seqExpr
@@ -329,18 +325,6 @@ matchAllLambdaExpr = keywordMatchAllLambda >> MatchAllLambdaExpr <$> expr <*> ((
329325
matchLambdaExpr :: Parser EgisonExpr
330326
matchLambdaExpr = keywordMatchLambda >> MatchLambdaExpr <$> expr <*> matchClauses
331327

332-
nextMatchAllExpr :: Parser EgisonExpr
333-
nextMatchAllExpr = keywordNextMatchAll >> NextMatchAllExpr <$> expr <*> expr <*> matchClause
334-
335-
nextMatchExpr :: Parser EgisonExpr
336-
nextMatchExpr = keywordNextMatch >> NextMatchExpr <$> expr <*> expr <*> matchClauses
337-
338-
nextMatchAllLambdaExpr :: Parser EgisonExpr
339-
nextMatchAllLambdaExpr = keywordNextMatchAllLambda >> NextMatchAllLambdaExpr <$> expr <*> matchClause
340-
341-
nextMatchLambdaExpr :: Parser EgisonExpr
342-
nextMatchLambdaExpr = keywordNextMatchLambda >> NextMatchLambdaExpr <$> expr <*> matchClauses
343-
344328
matchClauses :: Parser [MatchClause]
345329
matchClauses = braces $ sepEndBy matchClause whiteSpace
346330

@@ -900,10 +884,6 @@ keywordMatchAll = reserved "match-all"
900884
keywordMatchAllLambda = reserved "match-all-lambda"
901885
keywordMatch = reserved "match"
902886
keywordMatchLambda = reserved "match-lambda"
903-
keywordNextMatchAll = reserved "next-match-all"
904-
keywordNextMatchAllLambda = reserved "next-match-all-lambda"
905-
keywordNextMatch = reserved "next-match"
906-
keywordNextMatchLambda = reserved "next-match-lambda"
907887
keywordMatcher = reserved "matcher"
908888
keywordMatcherDFS = reserved "matcher-dfs"
909889
keywordDo = reserved "do"

hs-src/Language/Egison/Types.hs

-5
Original file line numberDiff line numberDiff line change
@@ -256,11 +256,6 @@ data EgisonExpr =
256256
| MatchLambdaExpr EgisonExpr [MatchClause]
257257
| MatchAllLambdaExpr EgisonExpr [MatchClause]
258258

259-
| NextMatchExpr EgisonExpr EgisonExpr [MatchClause]
260-
| NextMatchAllExpr EgisonExpr EgisonExpr MatchClause
261-
| NextMatchLambdaExpr EgisonExpr [MatchClause]
262-
| NextMatchAllLambdaExpr EgisonExpr MatchClause
263-
264259
| MatcherExpr MatcherInfo
265260
| MatcherDFSExpr MatcherInfo
266261
| AlgebraicDataMatcherExpr [(String, [EgisonExpr])]

0 commit comments

Comments
 (0)