summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into fintan/canonicalizeNadrieril Feneanar2019-10-124-46/+27
|\
| * Update dhall-lang submoduleNadrieril2019-09-202-1/+7
| * Update dhall-lang submoduleNadrieril2019-09-202-39/+13
| * Update pest_consume dependencyNadrieril2019-09-202-6/+7
* | Merge branch 'master' into fintan/canonicalizeNadrieril Feneanar2019-09-2011-923/+288
|\|
| * Merge pull request #113 from Nadrieril/pest_consumeNadrieril Feneanar2019-09-1911-923/+288
| |\
| | * Extract pest_consume into its own crateNadrieril2019-09-1812-1186/+36
| | * Change invocation syntax of pest_consume::parser macroNadrieril2019-09-174-6/+31
| | * Tweak match_nodesNadrieril2019-09-172-57/+72
| | * Update terminology in match_nodesNadrieril2019-09-171-36/+36
| | * Remove need for slice_patterns in pest_consumeNadrieril2019-09-174-35/+47
| | * Add basic doc to pest_consumeNadrieril2019-09-111-5/+118
| | * Various tweaksNadrieril2019-09-116-42/+47
| | * Rename match_inputs to match_nodes to reflect new terminologyNadrieril2019-09-115-48/+48
| | * Add an example to pest_consumeNadrieril2019-09-115-0/+97
| | * No need to force user data to be a referenceNadrieril2019-09-102-64/+56
| | * Rename various bits of the pest_consume APINadrieril2019-09-105-165/+180
| | * Use an enum instead of strings for rule aliasingNadrieril2019-09-103-19/+41
| | * Avoid the use of drain_filter featureNadrieril2019-09-102-5/+28
| | * Tentatively derive pest::Parser normallyNadrieril2019-09-105-22/+20
| | * Use proc_macro_hack to avoid the need for the proc_macro_hygiene featureNadrieril2019-09-106-3/+19
| | * Allows using match_inputs outside of a make_parser implNadrieril2019-09-103-35/+40
| | * Implement parsing in PestConsumerNadrieril2019-09-103-8/+48
| | * FormattingNadrieril2019-09-101-65/+32
| | * Add dummy `entrypoint` attributeNadrieril2019-09-102-0/+8
| | * Use match_inputs for parser entrypointNadrieril2019-09-102-15/+47
| | * Remove custom pair debuggingNadrieril2019-09-101-52/+0
| | * Rename parse_children to match_inputsNadrieril2019-09-104-42/+42
| | * Generalize parse_children and change its invocationNadrieril2019-09-103-55/+139
| | * Move pest_consume macros into their own crateNadrieril2019-09-099-22/+59
| | * Move pest_consume into its own crateNadrieril2019-09-096-129/+150
| | * Make ParseInput independent from dhall-specific typesNadrieril2019-09-094-262/+268
| | * Store Spans at every node when parsingNadrieril2019-09-062-17/+51
| |/
* | Merge remote-tracking branch 'origin/master' into fintan/canonicalizeFintan Halpenny2019-09-0617-719/+1072
|\|
| * Merge pull request #112 from Nadrieril/improve-parserNadrieril Feneanar2019-09-065-310/+480
| |\
| | * Implement rule shortcutting, and cleanup make_parser codeNadrieril2019-09-052-67/+190
| | * Implement rule aliasing and simplify parser codeNadrieril2019-09-055-297/+344
| |/
| * Add mapping functions to InterpolatedTextContentsNadrieril2019-09-033-26/+54
| * Use map_mut in ValueF::normalize_mutNadrieril2019-09-032-16/+2
| * Merge pull request #111 from Nadrieril/resolve-mutNadrieril Feneanar2019-09-037-241/+426
| |\
| | * Merge branch 'master' into resolve-mutNadrieril Feneanar2019-09-032-125/+101
| | |\ | | |/ | |/|
| * | cargo upgrade and fix proc_macro2 version conflictNadrieril2019-09-032-125/+101
| | * Resolve imports by mutating Expr instead of cloning itNadrieril2019-09-036-244/+421
| | * No need to change the type of Embed when resolving anymoreNadrieril2019-09-033-16/+24
| |/
* | Merge remote-tracking branch 'origin/fintan/canonicalize' into fintan/canonic...Fintan Halpenny2019-09-0616-997/+1368
|\ \
| * | Merge remote-tracking branch 'origin/master' into fintan/canonicalizeNadrieril2019-09-0316-997/+1368
| |\|
| | * Upgrade rust toolchainNadrieril2019-09-038-41/+34
| | * Merge pull request #110 from Nadrieril/parser-proc-macroNadrieril Feneanar2019-09-029-962/+1351
| | |\
| | | * Improve hygiene of identifiersNadrieril2019-09-021-13/+20
| | | * Parse polymorphically in the Embed parameterNadrieril2019-09-023-102/+130