diff options
Diffstat (limited to 'base/src/main/java')
5 files changed, 18 insertions, 10 deletions
diff --git a/base/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java b/base/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java index 4bbc154..64e6b8f 100644 --- a/base/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java +++ b/base/src/main/java/bjc/utils/funcdata/theory/Bifunctor.java @@ -33,7 +33,9 @@ public interface Bifunctor<LeftType, RightType> { */ public interface BifunctorMap<OldLeft, OldRight, NewLeft, NewRight> extends Function<Bifunctor<OldLeft, OldRight>, Bifunctor<NewLeft, NewRight>> { - + /* + * Alias + */ } /** @@ -52,7 +54,9 @@ public interface Bifunctor<LeftType, RightType> { */ public interface LeftBifunctorMap<OldLeft, OldRight, NewLeft> extends BifunctorMap<OldLeft, OldRight, NewLeft, OldRight> { - + /* + * Alias + */ } /** @@ -71,7 +75,9 @@ public interface Bifunctor<LeftType, RightType> { */ public interface RightBifunctorMap<OldLeft, OldRight, NewRight> extends BifunctorMap<OldLeft, OldRight, OldLeft, NewRight> { - + /* + * Alias + */ } /** diff --git a/base/src/main/java/bjc/utils/functypes/ListFlattener.java b/base/src/main/java/bjc/utils/functypes/ListFlattener.java index bdf0a09..6b7908a 100644 --- a/base/src/main/java/bjc/utils/functypes/ListFlattener.java +++ b/base/src/main/java/bjc/utils/functypes/ListFlattener.java @@ -13,5 +13,7 @@ import bjc.utils.funcdata.IList; * The type of value in the list. */ public interface ListFlattener<S> extends Function<IList<S>, S> { - + /* + * Alias + */ } diff --git a/base/src/main/java/bjc/utils/math/CardinalState.java b/base/src/main/java/bjc/utils/math/CardinalState.java index f42fb85..d8990dd 100644 --- a/base/src/main/java/bjc/utils/math/CardinalState.java +++ b/base/src/main/java/bjc/utils/math/CardinalState.java @@ -25,7 +25,9 @@ public class CardinalState { */ @FunctionalInterface public interface Cardinalizer extends BiFunction<Long, CardinalState, String> { - + /* + * Alias + */ } /** diff --git a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java index 6d27202..7b159af 100644 --- a/base/src/main/java/bjc/utils/parserutils/TokenUtils.java +++ b/base/src/main/java/bjc/utils/parserutils/TokenUtils.java @@ -226,12 +226,8 @@ public class TokenUtils { escapeRep = "\\"; break; default: -<<<<<<< Updated upstream - if(escapeSeq.startsWith("u")) { -======= /* Handle a non-short form escape. */ if (escapeSeq.startsWith("u")) { ->>>>>>> Stashed changes escapeRep = handleUnicodeEscape(escapeSeq.substring(1)); } else { escapeRep = handleOctalEscape(escapeSeq); diff --git a/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java b/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java index 960e61a..64868fd 100644 --- a/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java +++ b/base/src/main/java/bjc/utils/parserutils/TreeConstructor.java @@ -26,7 +26,9 @@ public class TreeConstructor { * The token type of the tree. */ public interface QueueFlattener<TokenType> extends Function<Deque<ITree<TokenType>>, ITree<TokenType>> { - + /* + * Alias + */ } /* Alias for constructor state. */ |