git.iko.soy/Idris-dev
on master help sign in
Merge pull request #41 from mekeor/master
71c5b66Edwin Brady
impl-paper/Makefile−3
compare with master
unifiedsplit
@@ -10,9 +10,6 @@ DIAGS =
10
10
11SOURCES = ${TEXFILES} ${DIAGS} macros.ltx library.bib
11SOURCES = ${TEXFILES} ${DIAGS} macros.ltx library.bib
12
12
13−library.bib: .PHONY
14− cp ~/Research/Papers/library.bib .
15−
16DITAA = java -jar ~/Downloads/ditaa.jar
13DITAA = java -jar ~/Downloads/ditaa.jar
17
14
18${PAPER}.pdf: ${SOURCES}
15${PAPER}.pdf: ${SOURCES}
src/Idris/Parser.hs+1−1
@@ -474,7 +474,7 @@ fixity = try (do reserved "infixl"; return Infixl)
474 <|> try (do reserved "infix"; return InfixN)
474 <|> try (do reserved "infix"; return InfixN)
475 <|> try (do reserved "prefix"; return PrefixN)
475 <|> try (do reserved "prefix"; return PrefixN)
476
476
477−--------- Tyoe classes ---------
477+--------- Type classes ---------
478
478
479pClass :: SyntaxInfo -> IParser [PDecl]
479pClass :: SyntaxInfo -> IParser [PDecl]
480pClass syn = do acc <- pAccessibility
480pClass syn = do acc <- pAccessibility