forked from eclipse-tm4e/tm4e
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
114 additions
and
37 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| /** | ||
| * Copyright (c) 2015-2017 Angelo ZERR. | ||
| * Copyright (c) 2015-2017 Angelo ZERR. | ||
| * This program and the accompanying materials are made | ||
| * available under the terms of the Eclipse Public License 2.0 | ||
| * which is available at https://www.eclipse.org/legal/epl-2.0/ | ||
|
|
@@ -11,15 +11,16 @@ | |
| * Initial license: MIT | ||
| * | ||
| * Contributors: | ||
| * - Microsoft Corporation: Initial code, written in TypeScript, licensed under MIT license | ||
| * - Angelo Zerr <[email protected]> - translation and adaptation to Java | ||
| * - Microsoft Corporation: Initial code, written in TypeScript, licensed under MIT license | ||
| * - Angelo Zerr <[email protected]> - translation and adaptation to Java | ||
| */ | ||
| package org.eclipse.tm4e.core.grammar; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
|
|
||
| import org.eclipse.jdt.annotation.Nullable; | ||
| import org.eclipse.tm4e.core.internal.grammar.ScopeListElement; | ||
| import org.eclipse.tm4e.core.internal.rule.IRuleRegistry; | ||
| import org.eclipse.tm4e.core.internal.rule.Rule; | ||
|
|
@@ -33,7 +34,7 @@ | |
| */ | ||
| public class StackElement { | ||
|
|
||
| public static final StackElement NULL = new StackElement(null, 0, 0, null, null, null); | ||
| public static final StackElement NULL = new StackElement(null, 0, 0, 0, false, null, null, null); | ||
|
|
||
| /** | ||
| * The position on the current line where this state was pushed. | ||
|
|
@@ -42,10 +43,19 @@ public class StackElement { | |
| */ | ||
| private int enterPosition; | ||
|
|
||
| /** | ||
| * The captured anchor position when this stack element was pushed. | ||
| * This is relevant only while tokenizing a line, to restore the anchor position when popping. | ||
| * Its value is meaningless across lines. | ||
| */ | ||
| private int anchorPos; | ||
|
|
||
| /** | ||
| * The previous state on the stack (or null for the root state). | ||
| */ | ||
| @Nullable | ||
| public final StackElement parent; | ||
|
|
||
| /** | ||
| * The depth of the stack. | ||
| */ | ||
|
|
@@ -55,25 +65,43 @@ public class StackElement { | |
| * The state (rule) that this element represents. | ||
| */ | ||
| public final int ruleId; | ||
|
|
||
| /** | ||
| * The state has entered and captured \n. This means that the next line should have an anchorPosition of 0. | ||
| */ | ||
| public final boolean beginRuleCapturedEOL; | ||
|
|
||
| /** | ||
| * The "pop" (end) condition for this state in case that it was dynamically generated through captured text. | ||
| */ | ||
| public final String endRule; | ||
|
|
||
| /** | ||
| * The list of scopes containing the "name" for this state. | ||
| */ | ||
|
|
||
| public final ScopeListElement nameScopesList; | ||
| /** | ||
| * The list of scopes containing the "contentName" (besides "name") for this state. | ||
| * This list **must** contain as an element `scopeName`. | ||
| */ | ||
| public final ScopeListElement contentNameScopesList; | ||
|
|
||
| public StackElement(StackElement parent, int ruleId, int enterPos, String endRule, ScopeListElement nameScopesList, ScopeListElement contentNameScopesList) { | ||
| public StackElement( | ||
| @Nullable StackElement parent, | ||
| int ruleId, | ||
| int enterPos, | ||
| int anchorPos, | ||
| boolean beginRuleCapturedEOL, | ||
| @Nullable String endRule, | ||
| ScopeListElement nameScopesList, | ||
| ScopeListElement contentNameScopesList) { | ||
| this.parent = parent; | ||
| this.depth = (this.parent != null ? this.parent.depth + 1 : 1); | ||
| this.ruleId = ruleId; | ||
| this.enterPosition = enterPos; | ||
| this.anchorPos = anchorPos; | ||
| this.beginRuleCapturedEOL = beginRuleCapturedEOL; | ||
| this.endRule = endRule; | ||
| this.nameScopesList = nameScopesList; | ||
| this.contentNameScopesList = contentNameScopesList; | ||
|
|
@@ -82,44 +110,71 @@ public StackElement(StackElement parent, int ruleId, int enterPos, String endRul | |
| /** | ||
| * A structural equals check. Does not take into account `scopes`. | ||
| */ | ||
| private static boolean structuralEquals(StackElement a, StackElement b) { | ||
| private static boolean structuralEquals(@Nullable StackElement a, @Nullable StackElement b) { | ||
| do { | ||
| if (a == b) { | ||
| return true; | ||
| } | ||
|
|
||
| if (a == null && b == null) { | ||
| // End of list reached for both | ||
| return true; | ||
| } | ||
|
|
||
| if (a == null || b == null) { | ||
| // End of list reached only for one | ||
| return false; | ||
| } | ||
|
|
||
| if (a.depth != b.depth || a.ruleId != b.ruleId || !Objects.equals(a.endRule, b.endRule)) { | ||
| return false; | ||
| } | ||
|
|
||
| // Go to previous pair | ||
| a = a.parent; | ||
| b = b.parent; | ||
| } while (true); | ||
| } | ||
|
|
||
| @SuppressWarnings("null") | ||
| private static boolean equals(@Nullable StackElement a, @Nullable StackElement b) { | ||
| if (a == b) { | ||
| return true; | ||
| } | ||
| if (a == null || b == null) { | ||
| if (!structuralEquals(a, b)) { | ||
| return false; | ||
| } | ||
| return a.depth == b.depth && a.ruleId == b.ruleId && Objects.equals(a.endRule, b.endRule) && structuralEquals(a.parent, b.parent); | ||
| return a.contentNameScopesList.equals(b.contentNameScopesList); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object other) { | ||
| if (other == this) { | ||
| return true; | ||
| } | ||
| if (other == null) { | ||
| if (other == null || other.getClass() != StackElement.class) { | ||
| return false; | ||
| } | ||
| if (!(other instanceof StackElement)) { | ||
| return false; | ||
| } | ||
| StackElement stackElement = (StackElement)other; | ||
| return structuralEquals(this, stackElement) && this.contentNameScopesList.equals(stackElement.contentNameScopesList); | ||
| return equals(this, (StackElement) other); | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return Objects.hash(depth, ruleId, endRule, parent, contentNameScopesList); | ||
| final int prime = 31; | ||
| int result = 1; | ||
| result = prime * result + Objects.hash(endRule, parent, contentNameScopesList); | ||
| result = prime * result + depth; | ||
| result = prime * result + ruleId; | ||
| return result; | ||
| } | ||
|
|
||
| public void reset() { | ||
| StackElement el = this; | ||
| while (el != null) { | ||
| el.enterPosition = -1; | ||
| el.anchorPos = -1; | ||
| el = el.parent; | ||
| } | ||
| } | ||
|
|
||
| @Nullable | ||
| public StackElement pop() { | ||
| return this.parent; | ||
| } | ||
|
|
@@ -131,8 +186,19 @@ public StackElement safePop() { | |
| return this; | ||
| } | ||
|
|
||
| public StackElement push(int ruleId, int enterPos, String endRule, ScopeListElement nameScopesList, ScopeListElement contentNameScopesList) { | ||
| return new StackElement(this, ruleId, enterPos, endRule, nameScopesList, contentNameScopesList); | ||
| public StackElement push(int ruleId, | ||
| int enterPos, | ||
| int anchorPos, | ||
| boolean beginRuleCapturedEOL, | ||
| @Nullable String endRule, | ||
| ScopeListElement nameScopesList, | ||
| ScopeListElement contentNameScopesList) { | ||
| return new StackElement(this, ruleId, enterPos, anchorPos, beginRuleCapturedEOL, endRule, nameScopesList, | ||
| contentNameScopesList); | ||
| } | ||
|
|
||
| public int getAnchorPos() { | ||
| return anchorPos; | ||
| } | ||
|
|
||
| public int getEnterPos() { | ||
|
|
@@ -147,7 +213,8 @@ private void appendString(List<String> res) { | |
| if (this.parent != null) { | ||
| this.parent.appendString(res); | ||
| } | ||
| res.add('(' + Integer.toString(this.ruleId) + ')'); //, TODO-${this.nameScopesList}, TODO-${this.contentNameScopesList})`; | ||
| res.add('(' + Integer.toString(this.ruleId) + ')'); // , TODO-${this.nameScopesList}, | ||
| // TODO-${this.contentNameScopesList})`; | ||
| } | ||
|
|
||
| @Override | ||
|
|
@@ -161,14 +228,18 @@ public StackElement setContentNameScopesList(ScopeListElement contentNameScopesL | |
| if (this.contentNameScopesList.equals(contentNameScopesList)) { | ||
| return this; | ||
| } | ||
| return this.parent.push(this.ruleId, this.enterPosition, this.endRule, this.nameScopesList, contentNameScopesList); | ||
| final var parent = this.parent; | ||
| assert parent != null; | ||
| return parent.push(this.ruleId, this.enterPosition, this.anchorPos, this.beginRuleCapturedEOL, this.endRule, | ||
| this.nameScopesList, contentNameScopesList); | ||
| } | ||
|
|
||
| public StackElement setEndRule(String endRule) { | ||
| if (this.endRule != null && this.endRule.equals(endRule)) { | ||
| return this; | ||
| } | ||
| return new StackElement(this.parent, this.ruleId, this.enterPosition, endRule, this.nameScopesList, this.contentNameScopesList); | ||
| return new StackElement(this.parent, this.ruleId, this.enterPosition, this.anchorPos, this.beginRuleCapturedEOL, | ||
| this.endRule, this.nameScopesList, this.contentNameScopesList); | ||
| } | ||
|
|
||
| public boolean hasSameRuleAs(final StackElement other) { | ||
|
|
||
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