47f5867 · Idris-dev · git.iko.soy

git.iko.soy/Idris-dev

on master help sign in

Refactor parsing of bracketed expressions

47f5867Edwin Brady13 years ago

libs/base/Data/ZZ.idr+1−1

compare with master

unifiedsplit

@@ -67,7 +67,7 @@ multZ (Pos n) (NegS m) = negNat $ n * (S m)

68fromInt : Integer -> ZZ

69fromInt n = if n < 0

70− then NegS $ fromInteger {a=Nat} (-n - 1)

70+ then NegS $ fromInteger {a=Nat} ((-n) - 1)

71 else Pos $ fromInteger {a=Nat} n

73instance Cast Nat ZZ where

src/Idris/ParseExpr.hs+37−33

@@ -337,45 +337,49 @@ bracketed syn =

337 do lchar ')'

338 fc <- getFC

339 return $ PTrue fc

340− <|>

341− try (do l <- expr syn

342− lchar ')'

343− return l)

344− <|> do (l, fc) <- try (do

345− l <- expr syn

346− fc <- getFC

347− lchar ','

348− return (l, fc))

349− rs <- sepBy1 (do fc' <- getFC; r <- expr syn; return (r, fc')) (lchar ',')

350− lchar ')'

351− return $ PPair fc l (mergePairs rs)

352− <|> do (l, fc) <- try (do

353− l <- expr syn

354− fc <- getFC

355− reservedOp "**"

356− return (l, fc))

357− r <- expr syn

358− lchar ')'

359− return (PDPair fc l Placeholder r)

360− <|> try(do fc0 <- getFC

361− l <- expr' syn

362− o <- operator

363− lchar ')'

364− return $ PLam (sMN 1000 "ARG") Placeholder

365− (PApp fc0 (PRef fc0 (sUN o)) [pexp l,

366− pexp (PRef fc0 (sMN 1000 "ARG"))]))

367− <|> try(do fc <- getFC; o <- operator; e <- expr syn; lchar ')'

368− return $ PLam (sMN 1000 "ARG") Placeholder

369− (PApp fc (PRef fc (sUN o)) [pexp (PRef fc (sMN 1000 "ARG")),

370− pexp e]))

371− <|> try (do ln <- name; lchar ':'

340+ <|> try (do ln <- name; lchar ':';

372 lty <- expr syn

341 lty <- expr syn

373 reservedOp "**"

342 reservedOp "**"

374 fc <- getFC

343 fc <- getFC

375 r <- expr syn

344 r <- expr syn

376 lchar ')'

345 lchar ')'

377 return (PDPair fc (PRef fc ln) lty r))

346 return (PDPair fc (PRef fc ln) lty r))

347+ <|> try (do fc <- getFC; o <- operator; e <- expr syn; lchar ')'

348+ -- No prefix operators! (bit of a hack here...)

349+ if (o == "-" || o == "!")

350+ then fail "minus not allowed in section"

351+ else return $ PLam (sMN 1000 "ARG") Placeholder

352+ (PApp fc (PRef fc (sUN o)) [pexp (PRef fc (sMN 1000 "ARG")),

353+ pexp e]))

354+ <|> try (do l <- simpleExpr syn

355+ op <- option Nothing (do o <- operator

356+ lchar ')'

357+ return (Just o))

358+ fc0 <- getFC

359+ case op of

360+ Nothing -> bracketedExpr syn l

361+ Just o -> return $ PLam (sMN 1000 "ARG") Placeholder

362+ (PApp fc0 (PRef fc0 (sUN o)) [pexp l,

363+ pexp (PRef fc0 (sMN 1000 "ARG"))]))

364+ <|> do l <- expr syn

365+ bracketedExpr syn l

366+

367+bracketedExpr :: SyntaxInfo -> PTerm -> IdrisParser PTerm

368+bracketedExpr syn e =

369+ do lchar ')'; return e

370+ <|> do fc <- do fc <- getFC

371+ lchar ','

372+ return fc

373+ rs <- sepBy1 (do fc' <- getFC; r <- expr syn; return (r, fc')) (lchar ',')

374+ lchar ')'

375+ return $ PPair fc e (mergePairs rs)

376+ <|> do fc <- do fc <- getFC

377+ reservedOp "**"

378+ return fc

379+ r <- expr syn

380+ lchar ')'

381+ return (PDPair fc e Placeholder r)

378− <?> "end of braced expression"

382+ <?> "end of bracketed expression"

379 where mergePairs :: [(PTerm, FC)] -> PTerm

383 where mergePairs :: [(PTerm, FC)] -> PTerm

380 mergePairs [(t, fc)] = t

384 mergePairs [(t, fc)] = t

381 mergePairs ((t, fc):rs) = PPair fc t (mergePairs rs)

385 mergePairs ((t, fc):rs) = PPair fc t (mergePairs rs)

test/Makefile+1−1

@@ -5,7 +5,7 @@ TESTS = $(sort $(patsubst %/,%.test,$(wildcard */)))

5test: $(TESTS)

7%.test:

8− @perl ./runtest.pl $(patsubst %.test,%,$@)

8+ @perl ./runtest.pl without buffer001 $(patsubst %.test,%,$@)

10test_java:

11 perl ./runtest.pl without buffer001 --codegen Java