-
-
Notifications
You must be signed in to change notification settings - Fork 126
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Make doing 2,3 and 3 steps Next/Prev more efficient
- Loading branch information
1 parent
f822bce
commit a2ccf33
Showing
5 changed files
with
211 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
71 changes: 71 additions & 0 deletions
71
...yzer/src/main/java/nl/basjes/parse/useragent/analyze/treewalker/steps/walk/StepNextN.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Yet Another UserAgent Analyzer | ||
| * Copyright (C) 2013-2017 Niels Basjes | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package nl.basjes.parse.useragent.analyze.treewalker.steps.walk; | ||
|
|
||
| import nl.basjes.parse.useragent.analyze.treewalker.steps.Step; | ||
| import nl.basjes.parse.useragent.analyze.treewalker.steps.WalkList.WalkResult; | ||
| import org.antlr.v4.runtime.tree.ParseTree; | ||
|
|
||
| public class StepNextN extends Step { | ||
|
|
||
| private int steps = 1; | ||
|
|
||
| public StepNextN(int steps) { | ||
| this.steps = steps; | ||
| } | ||
|
|
||
| private ParseTree next(ParseTree tree) { | ||
| ParseTree parent = up(tree); | ||
| ParseTree child; | ||
| boolean foundCurrent = false; | ||
| int stepsToDo = steps; | ||
| for (int i = 0; i < parent.getChildCount(); i++) { | ||
| child = parent.getChild(i); | ||
| if (foundCurrent) { | ||
| if (treeIsSeparator(child)) { | ||
| continue; | ||
| } | ||
| stepsToDo--; | ||
| if (stepsToDo == 0) { | ||
| return child; | ||
| } | ||
| } | ||
|
|
||
| if (child == tree) { | ||
| foundCurrent = true; | ||
| } | ||
| } | ||
| return null; // There is no next | ||
| } | ||
|
|
||
| @Override | ||
| public WalkResult walk(ParseTree tree, String value) { | ||
| ParseTree nextTree = next(tree); | ||
| if (nextTree == null) { | ||
| return null; | ||
| } | ||
|
|
||
| return walkNextStep(nextTree, null); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Next("+steps+")"; | ||
| } | ||
|
|
||
| } |
72 changes: 72 additions & 0 deletions
72
...yzer/src/main/java/nl/basjes/parse/useragent/analyze/treewalker/steps/walk/StepPrevN.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,72 @@ | ||
| /* | ||
| * Yet Another UserAgent Analyzer | ||
| * Copyright (C) 2013-2017 Niels Basjes | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package nl.basjes.parse.useragent.analyze.treewalker.steps.walk; | ||
|
|
||
| import nl.basjes.parse.useragent.analyze.treewalker.steps.Step; | ||
| import nl.basjes.parse.useragent.analyze.treewalker.steps.WalkList.WalkResult; | ||
| import org.antlr.v4.runtime.tree.ParseTree; | ||
|
|
||
| public class StepPrevN extends Step { | ||
|
|
||
| private static final int SIZE = 20; | ||
| ParseTree[] children = new ParseTree[SIZE]; | ||
|
|
||
| private int steps = 1; | ||
|
|
||
| public StepPrevN(int steps) { | ||
| this.steps = steps; | ||
| } | ||
|
|
||
| private ParseTree prev(ParseTree tree) { | ||
| ParseTree parent = up(tree); | ||
|
|
||
| int lastChildIndex = -1; | ||
| ParseTree child = null; | ||
| int i; | ||
| for (i = 0; i < parent.getChildCount(); i++) { | ||
| if (!treeIsSeparator(child)) { | ||
| lastChildIndex++; | ||
| children[lastChildIndex] = child; | ||
| } | ||
| child = parent.getChild(i); | ||
| if (child == tree) { | ||
| if (lastChildIndex < steps) { | ||
| return null; | ||
| } | ||
| return children[lastChildIndex-steps+1]; | ||
| } | ||
| } | ||
| return null; // There is no previous | ||
| } | ||
|
|
||
| @Override | ||
| public WalkResult walk(ParseTree tree, String value) { | ||
| ParseTree nextTree = prev(tree); | ||
| if (nextTree == null) { | ||
| return null; | ||
| } | ||
|
|
||
| return walkNextStep(nextTree, null); | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Prev()"; | ||
| } | ||
|
|
||
| } |