[parboiled] 02/02: Merge tag 'upstream/1.1.6'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon Nov 10 20:51:29 UTC 2014


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository parboiled.

commit e23832614df8516cf57919941ce4948c0ccf48a7
Merge: 87a359a 600de01
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 10 21:47:58 2014 +0100

    Merge tag 'upstream/1.1.6'
    
    Upstream version 1.1.6

 .gitignore                                         |   12 +
 CHANGELOG                                          |  448 +++
 LICENSE                                            |  201 +
 README.markdown                                    |    9 +
 .../java/org/parboiled/examples/abc/AbcParser.java |   50 +
 .../main/java/org/parboiled/examples/abc/Main.java |   49 +
 .../examples/calculators/CalculatorParser.java     |   75 +
 .../examples/calculators/CalculatorParser0.java    |   63 +
 .../examples/calculators/CalculatorParser1.java    |  103 +
 .../examples/calculators/CalculatorParser2.java    |  151 +
 .../examples/calculators/CalculatorParser3.java    |  183 +
 .../examples/calculators/CalculatorParser4.java    |  109 +
 .../parboiled/examples/indenting/IndentNode.java   |   32 +
 .../org/parboiled/examples/indenting/Main.java     |   30 +
 .../parboiled/examples/indenting/SimpleIndent.java |   61 +
 .../java/AbstractJavaCharacterMatcher.java         |   58 +
 .../parboiled/examples/java/JavaLetterMatcher.java |   29 +
 .../examples/java/JavaLetterOrDigitMatcher.java    |   29 +
 .../org/parboiled/examples/java/JavaParser.java    | 1141 ++++++
 .../examples/java/JavaParserProfiler.java          |   46 +
 .../java/org/parboiled/examples/java/Main.java     |  171 +
 .../parboiled/examples/sparql/SparqlParser.java    |  796 ++++
 .../java/org/parboiled/examples/time/Main.java     |   48 +
 .../org/parboiled/examples/time/TimeParser.java    |  103 +
 .../src/test/java/ExamplesJavaTestWrapper.java     |   35 +
 .../parboiled/examples/TestNgParboiledTest.java    |   34 +
 .../java/org/parboiled/examples/abc/AbcTest.java   |   93 +
 .../calculators/CalculatorRecoveryTest.java        |   59 +
 .../examples/calculators/CalculatorsTest.java      |  145 +
 .../calculators/ProfilingParseRunnerTest.java      |   71 +
 .../calculators/ReportingParseRunnerTest.java      |   56 +
 .../calculators/TracingParseRunnerTest.java        |   91 +
 .../parboiled/examples/java/JavaRecoveryTest.java  |   63 +
 .../java/org/parboiled/examples/java/JavaTest.java |   92 +
 .../org/parboiled/examples/java/JavaTest2.java     |  127 +
 .../examples/java/ReportingParseRunnerTest.java    |   71 +
 .../org/parboiled/examples/sparql/SparqlTest.java  |  111 +
 .../java/org/parboiled/examples/time/TimeTest.java |   43 +
 .../resources/CalculatorErrorRecoveryTest.test     | 1047 ++++++
 .../src/test/resources/JavaErrorRecoveryTest.test  |  334 ++
 .../src/test/resources/SimpleJavaTest.test         |   60 +
 .../test/resources/SimpleJavaTestParseTree.test    | 1131 ++++++
 examples-java/src/test/resources/SparqlTest.test   | 3944 ++++++++++++++++++++
 .../examples/calculators/SimpleCalculator0.scala   |   41 +
 .../examples/calculators/SimpleCalculator1.scala   |   65 +
 .../org/parboiled/examples/json/JsonParser0.scala  |   74 +
 .../org/parboiled/examples/json/JsonParser1.scala  |  119 +
 .../org/parboiled/examples/json/JsonParser2.scala  |  123 +
 .../calculators/SimpleCalculatorTest.scala         |  100 +
 .../examples/calculators/TracingTest.scala         |   62 +
 .../parboiled/examples/json/JsonParserTest.scala   |   93 +
 .../src/main/java/org/parboiled/Action.java        |   39 +
 .../src/main/java/org/parboiled/Context.java       |  220 ++
 .../src/main/java/org/parboiled/ContextAware.java  |   34 +
 .../src/main/java/org/parboiled/MatchHandler.java  |   32 +
 .../main/java/org/parboiled/MatcherContext.java    |  372 ++
 .../src/main/java/org/parboiled/Node.java          |   67 +
 .../src/main/java/org/parboiled/NodeImpl.java      |   86 +
 .../main/java/org/parboiled/ParserStatistics.java  |  326 ++
 .../src/main/java/org/parboiled/Rule.java          |   71 +
 .../main/java/org/parboiled/SkippableAction.java   |   31 +
 .../org/parboiled/buffers/DefaultInputBuffer.java  |  130 +
 .../parboiled/buffers/IndentDedentInputBuffer.java |  263 ++
 .../java/org/parboiled/buffers/InputBuffer.java    |   99 +
 .../org/parboiled/buffers/InputBufferUtils.java    |   53 +
 .../org/parboiled/buffers/MutableInputBuffer.java  |  124 +
 .../java/org/parboiled/common/ArrayBuilder.java    |   76 +
 .../src/main/java/org/parboiled/common/Base64.java |  673 ++++
 .../java/org/parboiled/common/ConsoleSink.java     |   23 +
 .../main/java/org/parboiled/common/Factory.java    |   23 +
 .../main/java/org/parboiled/common/FileUtils.java  |  327 ++
 .../main/java/org/parboiled/common/Formatter.java  |   34 +
 .../org/parboiled/common/ImmutableLinkedList.java  |  191 +
 .../java/org/parboiled/common/ImmutableList.java   |  197 +
 .../java/org/parboiled/common/IntArrayStack.java   |  123 +
 .../java/org/parboiled/common/Preconditions.java   |  415 ++
 .../main/java/org/parboiled/common/Predicate.java  |   23 +
 .../main/java/org/parboiled/common/Predicates.java |  390 ++
 .../main/java/org/parboiled/common/Reference.java  |  117 +
 .../src/main/java/org/parboiled/common/Sink.java   |   21 +
 .../org/parboiled/common/StringBuilderSink.java    |   30 +
 .../java/org/parboiled/common/StringUtils.java     |  540 +++
 .../src/main/java/org/parboiled/common/Tuple2.java |   49 +
 .../src/main/java/org/parboiled/common/Tuple3.java |   53 +
 .../src/main/java/org/parboiled/common/Utils.java  |  347 ++
 .../java/org/parboiled/errors/ActionError.java     |   56 +
 .../java/org/parboiled/errors/ActionException.java |   44 +
 .../java/org/parboiled/errors/BasicParseError.java |   66 +
 .../errors/DefaultInvalidInputErrorFormatter.java  |  113 +
 .../main/java/org/parboiled/errors/ErrorUtils.java |  168 +
 .../org/parboiled/errors/GrammarException.java     |   47 +
 .../errors/IllegalIndentationException.java        |   41 +
 .../org/parboiled/errors/InvalidInputError.java    |   47 +
 .../main/java/org/parboiled/errors/ParseError.java |   55 +
 .../parboiled/errors/ParserRuntimeException.java   |   47 +
 .../org/parboiled/errors/ParsingException.java     |   48 +
 .../org/parboiled/matchers/AbstractMatcher.java    |  142 +
 .../java/org/parboiled/matchers/ActionMatcher.java |  125 +
 .../java/org/parboiled/matchers/AnyMatcher.java    |   54 +
 .../java/org/parboiled/matchers/AnyOfMatcher.java  |   48 +
 .../parboiled/matchers/CharIgnoreCaseMatcher.java  |   51 +
 .../java/org/parboiled/matchers/CharMatcher.java   |   66 +
 .../org/parboiled/matchers/CharRangeMatcher.java   |   53 +
 .../matchers/CustomDefaultLabelMatcher.java        |   49 +
 .../java/org/parboiled/matchers/CustomMatcher.java |   78 +
 .../java/org/parboiled/matchers/EmptyMatcher.java  |   41 +
 .../org/parboiled/matchers/FirstOfMatcher.java     |   53 +
 .../parboiled/matchers/FirstOfStringsMatcher.java  |  153 +
 .../main/java/org/parboiled/matchers/Matcher.java  |  101 +
 .../java/org/parboiled/matchers/MatcherUtils.java  |   29 +
 .../parboiled/matchers/MemoMismatchesMatcher.java  |  121 +
 .../org/parboiled/matchers/NothingMatcher.java     |   40 +
 .../org/parboiled/matchers/OneOrMoreMatcher.java   |   60 +
 .../org/parboiled/matchers/OptionalMatcher.java    |   45 +
 .../java/org/parboiled/matchers/ProxyMatcher.java  |  255 ++
 .../org/parboiled/matchers/SequenceMatcher.java    |   61 +
 .../java/org/parboiled/matchers/StringMatcher.java |   56 +
 .../java/org/parboiled/matchers/TestMatcher.java   |   55 +
 .../org/parboiled/matchers/TestNotMatcher.java     |   55 +
 .../org/parboiled/matchers/VarFramingMatcher.java  |  127 +
 .../org/parboiled/matchers/ZeroOrMoreMatcher.java  |   57 +
 .../matchervisitors/CanMatchEmptyVisitor.java      |  102 +
 .../matchervisitors/DefaultMatcherVisitor.java     |  104 +
 .../matchervisitors/DoWithMatcherVisitor.java      |  130 +
 .../matchervisitors/FollowMatchersVisitor.java     |   74 +
 .../matchervisitors/GetStarterCharVisitor.java     |   70 +
 .../IsSingleCharMatcherVisitor.java                |   91 +
 .../matchervisitors/IsStarterCharVisitor.java      |  106 +
 .../parboiled/matchervisitors/MatcherVisitor.java  |   61 +
 .../parserunners/AbstractParseRunner.java          |   98 +
 .../parboiled/parserunners/BasicParseRunner.java   |   79 +
 .../parserunners/ErrorLocatingParseRunner.java     |   89 +
 .../parserunners/ErrorReportingParseRunner.java    |   98 +
 .../org/parboiled/parserunners/ParseRunner.java    |   70 +
 .../parserunners/ProfilingParseRunner.java         |  500 +++
 .../parserunners/RecoveringParseRunner.java        |  546 +++
 .../parserunners/ReportingParseRunner.java         |  102 +
 .../parboiled/parserunners/TracingParseRunner.java |  129 +
 .../java/org/parboiled/support/Characters.java     |  291 ++
 .../src/main/java/org/parboiled/support/Chars.java |   72 +
 .../main/java/org/parboiled/support/Checks.java    |   53 +
 .../org/parboiled/support/DebuggingValueStack.java |  124 +
 .../org/parboiled/support/DefaultValueStack.java   |  238 ++
 .../main/java/org/parboiled/support/Filters.java   |  213 ++
 .../java/org/parboiled/support/IndexRange.java     |  139 +
 .../parboiled/support/LabelPrefixPredicate.java    |   39 +
 .../java/org/parboiled/support/MatcherPath.java    |  125 +
 .../org/parboiled/support/MatcherPosition.java     |   49 +
 .../java/org/parboiled/support/NodeFormatter.java  |   47 +
 .../java/org/parboiled/support/ParseTreeUtils.java |  350 ++
 .../java/org/parboiled/support/ParsingResult.java  |   87 +
 .../main/java/org/parboiled/support/Position.java  |   54 +
 .../org/parboiled/support/StringBuilderVar.java    |  139 +
 .../main/java/org/parboiled/support/StringVar.java |   94 +
 .../org/parboiled/support/ToStringFormatter.java   |   42 +
 .../java/org/parboiled/support/ValueStack.java     |  193 +
 .../src/main/java/org/parboiled/support/Var.java   |  137 +
 .../java/org/parboiled/trees/BinaryTreeNode.java   |   40 +
 .../main/java/org/parboiled/trees/GraphNode.java   |   36 +
 .../main/java/org/parboiled/trees/GraphUtils.java  |  151 +
 .../parboiled/trees/ImmutableBinaryTreeNode.java   |   49 +
 .../org/parboiled/trees/ImmutableGraphNode.java    |   48 +
 .../org/parboiled/trees/ImmutableTreeNode.java     |   55 +
 .../org/parboiled/trees/MutableBinaryTreeNode.java |   42 +
 .../parboiled/trees/MutableBinaryTreeNodeImpl.java |   58 +
 .../java/org/parboiled/trees/MutableTreeNode.java  |   57 +
 .../org/parboiled/trees/MutableTreeNodeImpl.java   |   91 +
 .../main/java/org/parboiled/trees/TreeNode.java    |   34 +
 .../main/java/org/parboiled/trees/TreeUtils.java   |   87 +
 parboiled-core/src/test/java/CoreTest.java         |   35 +
 .../parboiled/buffers/DefaultInputBufferTest.java  |   79 +
 .../buffers/IndentDedentInputBufferTest.java       |  207 +
 .../parboiled/buffers/MutableInputBufferTest.java  |  189 +
 .../org/parboiled/common/ArrayBuilderTest.java     |   31 +
 .../parboiled/common/ImmutableLinkedListTest.java  |   36 +
 .../org/parboiled/common/IntArrayStackTest.java    |   55 +
 .../java/org/parboiled/common/StringUtilsTest.java |   29 +
 .../test/java/org/parboiled/common/UtilsTest.java  |   72 +
 .../java/org/parboiled/support/CharactersTest.java |   60 +
 .../java/org/parboiled/support/ValueStackTest.java |   67 +
 .../resources/IndentDedentBuffer2.converted.test   |   11 +
 .../src/test/resources/IndentDedentBuffer2.test    |   25 +
 .../resources/IndentDedentBuffer3.converted.test   |    8 +
 .../src/test/resources/IndentDedentBuffer3.test    |   13 +
 .../src/main/java/org/parboiled/BaseActions.java   |  439 +++
 .../src/main/java/org/parboiled/BaseParser.java    |  693 ++++
 .../src/main/java/org/parboiled/Parboiled.java     |   62 +
 .../org/parboiled/annotations/BuildParseTree.java  |   37 +
 .../java/org/parboiled/annotations/Cached.java     |   33 +
 .../java/org/parboiled/annotations/DontExtend.java |   31 +
 .../java/org/parboiled/annotations/DontLabel.java  |   31 +
 .../annotations/DontSkipActionsInPredicates.java   |   32 +
 .../parboiled/annotations/ExplicitActionsOnly.java |   35 +
 .../main/java/org/parboiled/annotations/Label.java |   34 +
 .../org/parboiled/annotations/MemoMismatches.java  |   31 +
 .../annotations/SkipActionsInPredicates.java       |   39 +
 .../java/org/parboiled/annotations/SkipNode.java   |   35 +
 .../org/parboiled/annotations/SuppressNode.java    |   32 +
 .../parboiled/annotations/SuppressSubnodes.java    |   32 +
 .../java/org/parboiled/test/ParboiledTest.java     |  100 +
 .../parboiled/transform/ActionClassGenerator.java  |   59 +
 .../java/org/parboiled/transform/AsmUtils.java     |  347 ++
 .../java/org/parboiled/transform/BaseAction.java   |   47 +
 .../org/parboiled/transform/BaseGroupClass.java    |   35 +
 .../java/org/parboiled/transform/BaseVarInit.java  |   30 +
 .../transform/BodyWithSuperCallReplacer.java       |   52 +
 .../org/parboiled/transform/CachingGenerator.java  |  386 ++
 .../parboiled/transform/ClassNodeInitializer.java  |  169 +
 .../parboiled/transform/ConstructorGenerator.java  |   73 +
 .../parboiled/transform/FlagMarkingGenerator.java  |   70 +
 .../parboiled/transform/GroupClassGenerator.java   |  158 +
 .../transform/ImplicitActionsConverter.java        |  147 +
 .../transform/InstructionGraphCreator.java         |   59 +
 .../parboiled/transform/InstructionGraphNode.java  |  152 +
 .../org/parboiled/transform/InstructionGroup.java  |   87 +
 .../transform/InstructionGroupCreator.java         |  220 ++
 .../transform/InstructionGroupPreparer.java        |  300 ++
 .../parboiled/transform/LabellingGenerator.java    |   77 +
 .../org/parboiled/transform/ParserClassNode.java   |   77 +
 .../org/parboiled/transform/ParserTransformer.java |  107 +
 .../transform/ReturnInstructionUnifier.java        |   65 +
 .../java/org/parboiled/transform/RuleMethod.java   |  347 ++
 .../parboiled/transform/RuleMethodInterpreter.java |  161 +
 .../parboiled/transform/RuleMethodProcessor.java   |   25 +
 .../parboiled/transform/RuleMethodRewriter.java    |  103 +
 .../org/parboiled/transform/SuperCallRewriter.java |   81 +
 .../main/java/org/parboiled/transform/Types.java   |   58 +
 .../parboiled/transform/UnusedLabelsRemover.java   |   45 +
 .../parboiled/transform/VarFramingGenerator.java   |   93 +
 .../parboiled/transform/VarInitClassGenerator.java |   57 +
 parboiled-java/src/test/java/JavaTest.java         |   40 +
 parboiled-java/src/test/java/NoPackageParser.java  |   43 +
 .../src/test/java/org/parboiled/ActionTest.java    |  148 +
 .../test/java/org/parboiled/ActionVar2Test.java    |   88 +
 .../src/test/java/org/parboiled/ActionVarTest.java |   68 +
 .../src/test/java/org/parboiled/BugIn0100Test.java |   41 +
 .../src/test/java/org/parboiled/BugIn0990Test.java |   43 +
 .../src/test/java/org/parboiled/CachingTest.java   |  125 +
 .../test/java/org/parboiled/CurrentCharTest.java   |   42 +
 .../test/java/org/parboiled/InPredicateTest.java   |   86 +
 .../test/java/org/parboiled/IndentDedentTest.java  |   82 +
 .../src/test/java/org/parboiled/LabelTest.java     |  128 +
 .../java/org/parboiled/MemoMismatchesTest.java     |  156 +
 .../src/test/java/org/parboiled/NTimesTest.java    |   71 +
 .../test/java/org/parboiled/NodeSkippingTest.java  |  123 +
 .../java/org/parboiled/NodeSuppressionTest.java    |  109 +
 .../java/org/parboiled/ParserInheritanceTest.java  |   72 +
 .../src/test/java/org/parboiled/PrevCallsTest.java |   77 +
 .../src/test/java/org/parboiled/RecursionTest.java |   52 +
 .../src/test/java/org/parboiled/SimpleTest.java    |   60 +
 .../test/java/org/parboiled/SplitParserTest.java   |   66 +
 .../test/java/org/parboiled/VarFramingTest.java    |  107 +
 .../matchers/FirstOfStringsMatcherTest.java        |  117 +
 .../matchers/MemoMismatchesMatcherTest.java        |   48 +
 .../org/parboiled/parserunners/BugIn0990Test.java  |   48 +
 .../parserunners/EmptyErrorRecoveryTest.java       |   71 +
 .../parserunners/RecoveryErrorActionsTest.java     |  119 +
 .../parserunners/ReportingParseRunnerTest.java     |   75 +
 .../parserunners/SimpleErrorRecoveryTest.java      |  224 ++
 .../org/parboiled/support/MatcherPathTest.java     |   59 +
 .../org/parboiled/test/TestNgParboiledTest.java    |   32 +
 .../transform/ActionClassGeneratorTest.java        |  185 +
 .../java/org/parboiled/transform/AsmTestUtils.java |  113 +
 .../java/org/parboiled/transform/BugIn101Test.java |   60 +
 .../parboiled/transform/CachingGeneratorTest.java  |  144 +
 .../transform/ClassNodeInializerTest.java          |   98 +
 .../parboiled/transform/ErrorDetectionTest.java    |   85 +
 .../transform/ImplicitActionsConverterTest.java    |  102 +
 .../transform/InstructionGroupCreatorTest.java     |  135 +
 .../transform/InstructionGroupPreparerTest.java    |   68 +
 .../transform/ParserExtensionVerificationTest.java |   48 +
 .../parboiled/transform/ParserHierarchyTest.java   |  246 ++
 .../transform/ReturnInstructionUnifierTest.java    |  112 +
 .../transform/RuleMethodRewriterTest.java          |  158 +
 .../java/org/parboiled/transform/TestParser.java   |  127 +
 .../parboiled/transform/TransformationTest.java    |   47 +
 .../transform/VarInitClassGeneratorTest.java       |  160 +
 .../src/main/scala/org/parboiled/scala/Input.scala |   38 +
 .../main/scala/org/parboiled/scala/Parser.scala    |  490 +++
 .../scala/org/parboiled/scala/ParsingResult.scala  |   43 +
 .../scala/org/parboiled/scala/RuleOption.scala     |   46 +
 .../org/parboiled/scala/WithContextAction.scala    |   47 +
 .../main/scala/org/parboiled/scala/package.scala   |  177 +
 .../scala/parserunners/BasicParseRunner.scala      |   35 +
 .../parboiled/scala/parserunners/ParseRunner.scala |   27 +
 .../scala/parserunners/RecoveringParseRunner.scala |   60 +
 .../scala/parserunners/ReportingParseRunner.scala  |   35 +
 .../scala/parserunners/TracingParseRunner.scala    |  142 +
 .../scala/org/parboiled/scala/rules/CharRule.scala |   39 +
 .../scala/org/parboiled/scala/rules/PopRule.scala  |   53 +
 .../scala/org/parboiled/scala/rules/PushRule.scala |  374 ++
 .../org/parboiled/scala/rules/ReductionRule.scala  |   60 +
 .../scala/org/parboiled/scala/rules/Rule.scala     |  249 ++
 .../scala/org/parboiled/scala/rules/Rule0.scala    |   61 +
 .../parboiled/scala/testing/ParboiledTest.scala    |   83 +
 .../org/parboiled/scala/utils/Predicate.scala      |   34 +
 .../scala/org/parboiled/scala/BugIn101Test.scala   |   43 +
 .../org/parboiled/scala/EOIMatchingTest.scala      |   42 +
 .../org/parboiled/scala/FirstOfStringsTest.scala   |   47 +
 .../parboiled/scala/LoopedReductionRuleTest.scala  |   78 +
 .../scala/org/parboiled/scala/NTimesTest.scala     |   62 +
 .../scala/org/parboiled/scala/RecursionTest.scala  |   73 +
 .../parboiled/scala/SemanticPredicateTest.scala    |   59 +
 .../scala/org/parboiled/scala/SimpleTest.scala     |   79 +
 .../parboiled/scala/SyntacticPredicateTest.scala   |   49 +
 .../org/parboiled/scala/WithContextTest.scala      |   58 +
 project/Build.scala                                |  173 +
 project/Dependencies.scala                         |   21 +
 project/Plugins.sbt                                |    3 +
 project/build.properties                           |    1 +
 310 files changed, 39959 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/parboiled.git



More information about the pkg-java-commits mailing list