From 72516ccadfb4c7718aa97017d99dcf2231a20f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Sat, 3 Jun 2017 14:00:55 +0200 Subject: [PATCH 01/13] delete _.java --- org.coreasm.engine/src/org/coreasm/engine/parser/_.java | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 org.coreasm.engine/src/org/coreasm/engine/parser/_.java diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/_.java b/org.coreasm.engine/src/org/coreasm/engine/parser/_.java deleted file mode 100644 index 398f35c0..00000000 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/_.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.coreasm.engine.parser; - -public class _ { - -} From 5bbed1ed9d891e192324c79e6cdb0c63f098505c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Sun, 1 Apr 2018 11:12:00 +0200 Subject: [PATCH 02/13] jparsec: upgrade to 2.3 --- org.coreasm.engine/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/org.coreasm.engine/pom.xml b/org.coreasm.engine/pom.xml index 049f7cbd..65d8202b 100644 --- a/org.coreasm.engine/pom.xml +++ b/org.coreasm.engine/pom.xml @@ -128,7 +128,7 @@ org.jparsec jparsec - 2.1 + 2.3 concurrent From a8e33217436cee80040fed3bc228e0d0fcab76ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Sun, 1 Apr 2018 11:21:31 +0200 Subject: [PATCH 03/13] jparsec: fix deprecation warnings --- .../src/org/coreasm/engine/parser/ParserTools.java | 9 +++------ .../org/coreasm/engine/plugins/number/NumberPlugin.java | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index f2a846a0..dcd5494d 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -1,9 +1,6 @@ package org.coreasm.engine.parser; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; +import java.util.*; import org.codehaus.jparsec.Parser; import org.codehaus.jparsec.Parsers; @@ -59,7 +56,7 @@ private ParserTools() { initialized = false; } - public void init(String [] keywords, String[] operators, Set> lexers) + public void init(String [] keywords, String[] ops, Set> lexers) { if (initialized == true) throw new EngineError("Cannot re-initialize ParserTools."); @@ -67,7 +64,7 @@ public void init(String [] keywords, String[] operators, Set>(); oprParsers = new HashMap>(); - terminals_keyw = Terminals.caseSensitive(operators, keywords); + terminals_keyw = Terminals.operators(ops).words(Scanners.IDENTIFIER).keywords(Arrays.asList(keywords)).build(); tokenizer_keyw = terminals_keyw.tokenizer(); tokenizer_id = Terminals.Identifier.TOKENIZER; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java index ca6c3bab..c543a782 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java @@ -263,7 +263,7 @@ public Set> getLexers() { Pattern pDigits = Patterns.range('0', '9').many1(); Pattern pFloat = pDigits.next(Patterns.isChar('.').next(pDigits).optional()); - Parser sFloat = Scanners.pattern(pFloat, "NUMBER").source(); + Parser sFloat = pFloat.toScanner("NUMBER").source(); tokenizer_nr = sFloat.map( new org.codehaus.jparsec.functors.Map() { @Override From 3e151d0136bce6f133417d5b5f65cb29777b97b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Sun, 1 Apr 2018 11:28:46 +0200 Subject: [PATCH 04/13] upgrade to java 8 - required for jparsec 3 --- org.coreasm.engine/pom.xml | 4 ++-- org.coreasm.parent/pom.xml | 4 ++-- org.coreasm.ui.carma/pom.xml | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/org.coreasm.engine/pom.xml b/org.coreasm.engine/pom.xml index 65d8202b..4e8afc4b 100644 --- a/org.coreasm.engine/pom.xml +++ b/org.coreasm.engine/pom.xml @@ -105,8 +105,8 @@ maven-compiler-plugin 3.6.0 - 1.7 - 1.7 + 1.8 + 1.8 false diff --git a/org.coreasm.parent/pom.xml b/org.coreasm.parent/pom.xml index 68a81859..6a44a7e6 100644 --- a/org.coreasm.parent/pom.xml +++ b/org.coreasm.parent/pom.xml @@ -100,8 +100,8 @@ maven-compiler-plugin 3.1 - 1.7 - 1.7 + 1.8 + 1.8 diff --git a/org.coreasm.ui.carma/pom.xml b/org.coreasm.ui.carma/pom.xml index 360c722b..431221d5 100644 --- a/org.coreasm.ui.carma/pom.xml +++ b/org.coreasm.ui.carma/pom.xml @@ -61,8 +61,8 @@ org.apache.maven.plugins maven-compiler-plugin - 1.7 - 1.7 + 1.8 + 1.8 From 111f0b2a261a246e7f4a5a5f5d28cbc665bcdec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Sun, 1 Apr 2018 11:09:16 +0200 Subject: [PATCH 05/13] jparsec: upgrade to 3.0 --- org.coreasm.engine/pom.xml | 2 +- .../engine/interpreter/ScannerInfo.java | 2 +- .../kernel/ExpressionParserFactory.java | 8 +++---- .../src/org/coreasm/engine/kernel/Kernel.java | 4 ++-- .../coreasm/engine/kernel/KernelServices.java | 2 +- .../engine/parser/GrammarProduction.java | 2 +- .../coreasm/engine/parser/GrammarRule.java | 4 ++-- .../coreasm/engine/parser/JParsecParser.java | 8 +++---- .../org/coreasm/engine/parser/ParseMap.java | 2 +- .../org/coreasm/engine/parser/ParseMap2.java | 2 +- .../org/coreasm/engine/parser/ParseMap3.java | 2 +- .../org/coreasm/engine/parser/ParseMap5.java | 2 +- .../engine/parser/ParserException.java | 6 ++--- .../coreasm/engine/parser/ParserTools.java | 14 +++++------ .../coreasm/engine/plugin/ParserPlugin.java | 2 +- .../abstraction/AbstractionPlugin.java | 4 ++-- .../plugins/activation/ActivationPlugin.java | 4 ++-- .../coreasm/engine/plugins/bag/BagPlugin.java | 4 ++-- .../plugins/blockrule/BlockRulePlugin.java | 4 ++-- .../plugins/caserule/CaseRulePlugin.java | 4 ++-- .../plugins/chooserule/ChooseRulePlugin.java | 4 ++-- .../plugins/collection/CollectionPlugin.java | 4 ++-- .../ConditionalRulePlugin.java | 4 ++-- .../plugins/debuginfo/DebugInfoPlugin.java | 4 ++-- .../plugins/extendrule/ExtendRulePlugin.java | 4 ++-- .../plugins/forallrule/ForallRulePlugin.java | 4 ++-- .../foreachrule/ForeachRulePlugin.java | 4 ++-- .../coreasm/engine/plugins/io/IOPlugin.java | 6 ++--- .../KernelExtensionsPlugin.java | 4 ++-- .../engine/plugins/letrule/LetRulePlugin.java | 4 ++-- .../engine/plugins/list/ListPlugin.java | 4 ++-- .../coreasm/engine/plugins/map/MapPlugin.java | 4 ++-- .../engine/plugins/math/MathPlugin.java | 2 +- .../plugins/modularity/ModularityPlugin.java | 6 ++--- .../engine/plugins/number/NumberPlugin.java | 24 +++++++++---------- .../engine/plugins/options/OptionsPlugin.java | 4 ++-- .../engine/plugins/plotter/PlotterPlugin.java | 4 ++-- .../predicatelogic/PredicateLogicPlugin.java | 4 ++-- .../plugins/property/PropertyPlugin.java | 4 ++-- .../engine/plugins/queue/QueuePlugin.java | 4 ++-- .../SchedulingPoliciesPlugin.java | 4 ++-- .../coreasm/engine/plugins/set/SetPlugin.java | 4 ++-- .../plugins/signature/SignaturePlugin.java | 4 ++-- .../engine/plugins/stack/StackPlugin.java | 4 ++-- .../engine/plugins/step/StepPlugin.java | 4 ++-- .../engine/plugins/string/StringPlugin.java | 8 +++---- .../engine/plugins/testing/TestingPlugin.java | 4 ++-- .../engine/plugins/tree/TreePlugin.java | 4 ++-- .../plugins/turboasm/TurboASMPlugin.java | 4 ++-- .../coreasm/jasmine/plugin/JasminePlugin.java | 12 +++++----- .../network/plugins/graph/GraphPlugin.java | 4 ++-- .../plugins/signals/SignalsPlugin.java | 4 ++-- 52 files changed, 122 insertions(+), 122 deletions(-) diff --git a/org.coreasm.engine/pom.xml b/org.coreasm.engine/pom.xml index 4e8afc4b..f535473d 100644 --- a/org.coreasm.engine/pom.xml +++ b/org.coreasm.engine/pom.xml @@ -128,7 +128,7 @@ org.jparsec jparsec - 2.3 + 3.0 concurrent diff --git a/org.coreasm.engine/src/org/coreasm/engine/interpreter/ScannerInfo.java b/org.coreasm.engine/src/org/coreasm/engine/interpreter/ScannerInfo.java index 12166c45..265b4c23 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/interpreter/ScannerInfo.java +++ b/org.coreasm.engine/src/org/coreasm/engine/interpreter/ScannerInfo.java @@ -15,7 +15,7 @@ import java.io.Serializable; -import org.codehaus.jparsec.Token; +import org.jparsec.Token; import org.coreasm.engine.Specification; import org.coreasm.engine.parser.CharacterPosition; import org.coreasm.engine.parser.Parser; diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java index ad5eb65f..c7361d3c 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java @@ -14,10 +14,10 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.OperatorTable; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.functors.Binary; -import org.codehaus.jparsec.functors.Unary; +import org.jparsec.OperatorTable; +import org.jparsec.Parser; +import org.jparsec.functors.Binary; +import org.jparsec.functors.Unary; import org.coreasm.engine.ControlAPI; import org.coreasm.engine.EngineError; import org.coreasm.engine.interpreter.ASTNode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java index a02c6556..f3b7adfb 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java @@ -24,8 +24,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.kernel.CompilerKernelPlugin; import org.coreasm.engine.ControlAPI; diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/KernelServices.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/KernelServices.java index 937019ed..22c8c563 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/KernelServices.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/KernelServices.java @@ -13,7 +13,7 @@ package org.coreasm.engine.kernel; -import org.codehaus.jparsec.Parser; +import org.jparsec.Parser; import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.plugin.PluginServiceInterface; diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarProduction.java b/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarProduction.java index 7c607700..1df39b71 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarProduction.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarProduction.java @@ -19,7 +19,7 @@ import java.util.Hashtable; import java.util.Iterator; -import org.codehaus.jparsec.Parser; +import org.jparsec.Parser; import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.parser.GrammarRule.GRType; import org.coreasm.util.CoreASMGlobal; diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarRule.java b/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarRule.java index b9ccf8b3..2d01d285 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarRule.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/GrammarRule.java @@ -15,10 +15,10 @@ import org.coreasm.engine.interpreter.Node; -import org.codehaus.jparsec.Parser; +import org.jparsec.Parser; /** - * A structure to hold a grammar rule, and a {@link jfun.parsec.Parser} instance + * A structure to hold a grammar rule, and a {@link org.jparsec.Parser} instance * for that grammar rule. * * @author Roozbeh Farahbod diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java b/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java index 6b86639a..8fa51efc 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java @@ -57,7 +57,7 @@ public class JParsecParser implements Parser { private boolean headerParsed = false; /** the actual parser -- a JParsec parser */ - private org.codehaus.jparsec.Parser parser; + private org.jparsec.Parser parser; /** the root grammar rule */ private GrammarRule rootGrammarRule; @@ -167,11 +167,11 @@ public void parseSpecification() throws ParserException { this.rootGrammarRule = ((ParserPlugin)kernel).getParsers().get("CoreASM"); this.parser = rootGrammarRule.parser; try { - org.codehaus.jparsec.Parser _parser = parser.from(parserTools.getTokenizer(), parserTools.getIgnored()); + org.jparsec.Parser _parser = parser.from(parserTools.getTokenizer(), parserTools.getIgnored()); rootNode = (ASTNode) _parser.parse(specification.getText()); } catch (Throwable e) { - if (e instanceof org.codehaus.jparsec.error.ParserException) { - org.codehaus.jparsec.error.ParserException pe = (org.codehaus.jparsec.error.ParserException) e; + if (e instanceof org.jparsec.error.ParserException) { + org.jparsec.error.ParserException pe = (org.jparsec.error.ParserException) e; Throwable cause = pe.getCause(); String msg = pe.getMessage(); msg = msg.substring(msg.indexOf("\n")+1); diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java index dd6214b9..115dbff4 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java @@ -15,7 +15,7 @@ import org.coreasm.engine.plugin.Plugin; -import org.codehaus.jparsec.functors.Map; +import org.jparsec.functors.Map; /** * Specialized version of {@link Map} that gets a plug-in name as well. diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java index 00be976e..4937be58 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java @@ -3,7 +3,7 @@ import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.plugin.Plugin; -import org.codehaus.jparsec.functors.Map2; +import org.jparsec.functors.Map2; /** * Specialized version of {@link Map3} that gets a plug-in name as well. diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap3.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap3.java index c822f296..6fbf1932 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap3.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap3.java @@ -16,7 +16,7 @@ import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.plugin.Plugin; -import org.codehaus.jparsec.functors.Map3; +import org.jparsec.functors.Map3; /** * Specialized version of {@link Map3} that gets a plug-in name as well. diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap5.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap5.java index 5d6e89ba..01046c73 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap5.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap5.java @@ -13,7 +13,7 @@ package org.coreasm.engine.parser; -import org.codehaus.jparsec.functors.Map5; +import org.jparsec.functors.Map5; import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.plugin.Plugin; diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java index f9980b76..1e6318b1 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java @@ -48,10 +48,10 @@ public ParserException(String message, CharacterPosition pos) { } public ParserException(Throwable cause) { - if (cause instanceof org.codehaus.jparsec.error.ParserException) { - org.codehaus.jparsec.error.ParserException pcause = (org.codehaus.jparsec.error.ParserException) cause; + if (cause instanceof org.jparsec.error.ParserException) { + org.jparsec.error.ParserException pcause = (org.jparsec.error.ParserException) cause; StringBuffer buf = new StringBuffer(); - org.codehaus.jparsec.error.ParseErrorDetails err = pcause.getErrorDetails(); + org.jparsec.error.ParseErrorDetails err = pcause.getErrorDetails(); if (err != null) { showExpecting(buf, err.getExpected().toArray(new String[] {} )); showUnexpected(buf, new String[] {err.getUnexpected()} ); diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index dcd5494d..b3db01be 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -2,13 +2,13 @@ import java.util.*; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; -import org.codehaus.jparsec.Scanners; -import org.codehaus.jparsec.Terminals; -import org.codehaus.jparsec.Token; -import org.codehaus.jparsec.Tokens.Fragment; -import org.codehaus.jparsec.functors.Map; +import org.jparsec.Parser; +import org.jparsec.Parsers; +import org.jparsec.Scanners; +import org.jparsec.Terminals; +import org.jparsec.Token; +import org.jparsec.Tokens.Fragment; +import org.jparsec.functors.Map; import org.coreasm.engine.ControlAPI; import org.coreasm.engine.EngineError; import org.coreasm.engine.interpreter.ASTNode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugin/ParserPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugin/ParserPlugin.java index 7e41a798..f13a14ee 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugin/ParserPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugin/ParserPlugin.java @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; +import org.jparsec.Parser; import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.parser.GrammarRule; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java index f2318445..ec5b03ef 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.abstraction.CompilerAbstractionPlugin; import org.coreasm.engine.VersionInfo; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java index 238a80d0..81b1b5a7 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.options.CompilerOptionsPlugin; import org.coreasm.engine.CoreASMError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java index a14a2118..53b67481 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java @@ -25,8 +25,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.EngineError; import org.coreasm.engine.EngineException; import org.coreasm.engine.VersionInfo; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java index fb52df76..37a03aba 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.blockrule.CompilerBlockRulePlugin; import org.coreasm.engine.EngineTools; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java index 493e5f6b..796ec385 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java @@ -20,8 +20,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.caserule.CompilerCaseRulePlugin; import org.coreasm.engine.VersionInfo; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java index 090b79b5..fdcf264b 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java @@ -24,8 +24,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.chooserule.CompilerChooseRulePlugin; import org.coreasm.engine.ControlAPI; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java index 86868e03..117e3325 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.collection.CompilerCollectionPlugin; import org.coreasm.engine.CoreASMError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java index b4fe6e38..bd35844d 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java @@ -17,8 +17,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.conditionalrule.CompilerConditionalRulePlugin; import org.coreasm.engine.CoreASMError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java index 7b721f33..48c1032b 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java @@ -24,8 +24,8 @@ import java.util.Set; import java.util.StringTokenizer; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.UpdateMultiset; import org.coreasm.engine.interpreter.ASTNode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java index e7811a67..af082a24 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.extendrule.CompilerExtendRulePlugin; import org.coreasm.engine.VersionInfo; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java index 685ac17a..0d756d2a 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java @@ -22,8 +22,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.forall.CompilerForallRulePlugin; import org.coreasm.engine.CoreASMError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java index 32619d53..17f8ba8d 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java @@ -8,8 +8,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.engine.CoreASMError; import org.coreasm.engine.VersionInfo; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java index 7fc41e0f..bb9ddc15 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java @@ -28,8 +28,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.io.CompilerIOPlugin; import org.coreasm.engine.CoreASMEngine.EngineMode; @@ -230,7 +230,7 @@ public Map getParsers() { npTools.getKeywParser(KEYWORD_INTO, PLUGIN_NAME), npTools.getOprParser(OPERATOR_LINUX_INTO)), termParser).optional() - }).map(new org.codehaus.jparsec.functors.Map() { + }).map(new org.jparsec.functors.Map() { public Node map(Object[] vals) { if (vals[2] == null) { Node node = new PrintRuleNode(((Node) vals[0]).getScannerInfo()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java index 8a71a96d..c30dc95b 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.kernelextensions.CompilerKernelExtensionsPlugin; import org.coreasm.engine.EngineTools; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java index 3adb9d50..99857ef0 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java @@ -23,8 +23,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.letrule.CompilerLetRulePlugin; import org.coreasm.engine.CoreASMError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java index 313382a2..3b215a84 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java @@ -23,8 +23,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.list.CompilerListPlugin; import org.coreasm.engine.EngineException; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java index a473f5b2..825e9d8e 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.map.CompilerMapPlugin; import org.coreasm.engine.EngineException; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java index 4bc40ef1..e54b8d7e 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; +import org.jparsec.Parser; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.math.CompilerMathPlugin; import org.coreasm.engine.VersionInfo; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java index ec3b8b8d..6bb93fe0 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java @@ -26,9 +26,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; -import org.codehaus.jparsec.Token; +import org.jparsec.Parser; +import org.jparsec.Parsers; +import org.jparsec.Token; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.modularity.CompilerModularityPlugin; import org.coreasm.engine.CoreASMEngine.EngineMode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java index c543a782..4542a4d5 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java @@ -20,16 +20,16 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; -import org.codehaus.jparsec.Scanners; -import org.codehaus.jparsec.Terminals; -import org.codehaus.jparsec.Token; -import org.codehaus.jparsec.Tokens; -import org.codehaus.jparsec.Tokens.Fragment; -import org.codehaus.jparsec.Tokens.Tag; -import org.codehaus.jparsec.pattern.Pattern; -import org.codehaus.jparsec.pattern.Patterns; +import org.jparsec.Parser; +import org.jparsec.Parsers; +import org.jparsec.Scanners; +import org.jparsec.Terminals; +import org.jparsec.Token; +import org.jparsec.Tokens; +import org.jparsec.Tokens.Fragment; +import org.jparsec.Tokens.Tag; +import org.jparsec.pattern.Pattern; +import org.jparsec.pattern.Patterns; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.number.CompilerNumberPlugin; import org.coreasm.engine.ControlAPI; @@ -265,7 +265,7 @@ public Set> getLexers() { Pattern pFloat = pDigits.next(Patterns.isChar('.').next(pDigits).optional()); Parser sFloat = pFloat.toScanner("NUMBER").source(); tokenizer_nr = sFloat.map( - new org.codehaus.jparsec.functors.Map() { + new org.jparsec.functors.Map() { @Override public Fragment map(String from) { return Tokens.fragment(from, Tag.DECIMAL); @@ -358,7 +358,7 @@ private Parser createNumberParser() { if (refNumberTermParser.get() == null) { Parser nrParser = Terminals.fragment(Tag.DECIMAL).token().map( - new org.codehaus.jparsec.functors.Map () { + new org.jparsec.functors.Map () { @Override public Node map(Token from) { return new NumberTermNode(new ScannerInfo(from), from.toString()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java index ff70e169..57a6a250 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.options.CompilerOptionsPlugin; import org.coreasm.engine.CoreASMEngine.EngineMode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java index 63c30d9b..13b06844 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.CoreASMEngine.EngineMode; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.BackgroundElement; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java index f8a4ad63..b456fc54 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java @@ -23,8 +23,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.predicatelogic.CompilerPredicateLogicPlugin; import org.coreasm.engine.CoreASMError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java index a4039fe1..2cdd2241 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.Element; import org.coreasm.engine.interpreter.ASTNode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java index 33e5e970..a47406d2 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.Element; import org.coreasm.engine.absstorage.Update; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java index 02443eec..089e317c 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java @@ -22,8 +22,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.CoreASMEngine.EngineMode; import org.coreasm.engine.CoreASMError; import org.coreasm.engine.CoreASMIssue; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java index 009a179e..cd658afe 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java @@ -22,8 +22,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.set.CompilerSetPlugin; import org.coreasm.engine.EngineError; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java index 2b385c2b..fa569cce 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java @@ -25,8 +25,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.signature.CompilerSignaturePlugin; import org.coreasm.engine.CoreASMEngine.EngineMode; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java index 7fe630bd..5491020f 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.BackgroundElement; import org.coreasm.engine.absstorage.FunctionElement; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java index 02d81d34..109e43aa 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.BackgroundElement; import org.coreasm.engine.absstorage.Element; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java index 2b9c8276..45add68a 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java @@ -22,9 +22,9 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Terminals; -import org.codehaus.jparsec.Token; +import org.jparsec.Parser; +import org.jparsec.Terminals; +import org.jparsec.Token; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.string.CompilerStringPlugin; import org.coreasm.engine.VersionInfo; @@ -152,7 +152,7 @@ public Map getParsers() { parsers = new HashMap(); Parser stringParser = Terminals.StringLiteral.PARSER.token().map( - new org.codehaus.jparsec.functors.Map() { + new org.jparsec.functors.Map() { @Override public Node map(Token from) { return new StringNode(StringElement.processEscapeCharacters(from.toString()), new ScannerInfo(from)); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java index 2d02fc79..452f946f 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java @@ -5,8 +5,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.interpreter.ASTNode; import org.coreasm.engine.interpreter.Node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java index ecb7a4dc..c220d34d 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java @@ -21,8 +21,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.ControlAPI; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.BackgroundElement; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java index e35a98fd..1291bb60 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java @@ -25,8 +25,8 @@ import java.util.Map.Entry; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.compiler.interfaces.CompilerPlugin; import org.coreasm.compiler.plugins.turboasm.CompilerTurboASMPlugin; import org.coreasm.engine.EngineError; diff --git a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java index 4a6be1f7..f722a91d 100755 --- a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java @@ -33,11 +33,11 @@ import java.util.Set; import java.util.StringTokenizer; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; -import org.codehaus.jparsec.Token; -import org.codehaus.jparsec.Tokens; -import org.codehaus.jparsec.Tokens.Fragment; +import org.jparsec.Parser; +import org.jparsec.Parsers; +import org.jparsec.Token; +import org.jparsec.Tokens; +import org.jparsec.Tokens.Fragment; import org.coreasm.engine.CoreASMEngine.EngineMode; import org.coreasm.engine.EngineError; import org.coreasm.engine.Specification; @@ -269,7 +269,7 @@ private Parser getBasicJavaIdParser() { ParserTools.getInstance(capi); Parser tokp = Parsers.ANY_TOKEN.token(); - basicJavaIdParser = tokp.map( new org.codehaus.jparsec.functors.Map() { + basicJavaIdParser = tokp.map( new org.jparsec.functors.Map() { @Override public Node map(Token from) { if (from.value() instanceof Tokens.Fragment) { diff --git a/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java b/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java index 0ab9c05d..752994a9 100755 --- a/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java @@ -22,8 +22,8 @@ import javax.swing.JFrame; import javax.swing.JPanel; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.CoreASMEngine; import org.coreasm.engine.CoreASMEngine.EngineMode; import org.coreasm.engine.EngineException; diff --git a/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java b/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java index 7282422f..84e2cde1 100755 --- a/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java @@ -19,8 +19,8 @@ import java.util.Map; import java.util.Set; -import org.codehaus.jparsec.Parser; -import org.codehaus.jparsec.Parsers; +import org.jparsec.Parser; +import org.jparsec.Parsers; import org.coreasm.engine.ControlAPI; import org.coreasm.engine.VersionInfo; import org.coreasm.engine.absstorage.BackgroundElement; From b5865900d2020263ed57532e3b413b0a49bfc43e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Sun, 1 Apr 2018 11:42:03 +0200 Subject: [PATCH 06/13] jparsec: migrate from jparsec.functors to java 8 API --- .../kernel/ExpressionParserFactory.java | 28 +++--- .../engine/kernel/ImportRuleParseMap.java | 3 +- .../src/org/coreasm/engine/kernel/Kernel.java | 31 ++++--- .../engine/kernel/TupleTermParseMap.java | 5 +- .../engine/kernel/UpdateRuleParseMap.java | 3 +- .../org/coreasm/engine/parser/ParseMap.java | 6 +- .../org/coreasm/engine/parser/ParseMap2.java | 6 +- .../coreasm/engine/parser/ParserTools.java | 89 ++++++++----------- .../abstraction/AbstractionPlugin.java | 2 +- .../plugins/activation/ActivationPlugin.java | 6 +- .../coreasm/engine/plugins/bag/BagPlugin.java | 10 ++- .../plugins/blockrule/BlockRulePlugin.java | 2 +- .../plugins/caserule/CaseRulePlugin.java | 3 +- .../plugins/chooserule/ChooseRulePlugin.java | 8 +- .../plugins/collection/CollectionPlugin.java | 6 +- .../ConditionalRulePlugin.java | 15 ++-- .../plugins/debuginfo/DebugInfoPlugin.java | 3 +- .../plugins/extendrule/ExtendRulePlugin.java | 3 +- .../plugins/forallrule/ForallRulePlugin.java | 3 +- .../foreachrule/ForeachRulePlugin.java | 3 +- .../coreasm/engine/plugins/io/IOPlugin.java | 32 ++++--- .../KernelExtensionsPlugin.java | 9 +- .../engine/plugins/letrule/LetRulePlugin.java | 5 +- .../engine/plugins/list/ListPlugin.java | 9 +- .../coreasm/engine/plugins/map/MapPlugin.java | 9 +- .../engine/plugins/math/MathPlugin.java | 3 +- .../modularity/CoreModuleParseMap.java | 5 +- .../plugins/modularity/ModularityPlugin.java | 2 +- .../engine/plugins/number/NumberPlugin.java | 22 ++--- .../engine/plugins/options/OptionsPlugin.java | 6 +- .../engine/plugins/plotter/PlotterPlugin.java | 3 +- .../predicatelogic/PredicateLogicPlugin.java | 6 +- .../plugins/property/PropertyPlugin.java | 5 +- .../engine/plugins/queue/QueuePlugin.java | 6 +- .../SchedulingPoliciesPlugin.java | 12 ++- .../coreasm/engine/plugins/set/SetPlugin.java | 10 ++- .../plugins/signature/SignaturePlugin.java | 21 +++-- .../engine/plugins/stack/StackPlugin.java | 6 +- .../engine/plugins/step/StepPlugin.java | 6 +- .../engine/plugins/string/StringPlugin.java | 7 +- .../engine/plugins/testing/TestingPlugin.java | 6 +- .../engine/plugins/tree/TreePlugin.java | 12 ++- .../plugins/turboasm/TurboASMPlugin.java | 23 +++-- .../coreasm/jasmine/plugin/JasminePlugin.java | 53 +++++------ .../network/plugins/graph/GraphPlugin.java | 4 +- .../plugins/signals/SignalsPlugin.java | 10 ++- 46 files changed, 288 insertions(+), 239 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java index c7361d3c..94517270 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java @@ -13,11 +13,11 @@ import java.util.HashMap; import java.util.Map; import java.util.Set; +import java.util.function.BinaryOperator; +import java.util.function.UnaryOperator; import org.jparsec.OperatorTable; import org.jparsec.Parser; -import org.jparsec.functors.Binary; -import org.jparsec.functors.Unary; import org.coreasm.engine.ControlAPI; import org.coreasm.engine.EngineError; import org.coreasm.engine.interpreter.ASTNode; @@ -303,7 +303,7 @@ private void addOperator(Map oprs, OperatorRule oprRule) { } /* Special unary map class */ - public static class UnaryMap implements Unary { + public static class UnaryMap implements UnaryOperator { //private String pluginNames; private String opr; @@ -329,7 +329,8 @@ public UnaryMap(String opr, String pluginNames, OpType type, Object[] nodes) { /** * Creates a tree for this operator with an {@link ASTNode} as its root. */ - public Node map(Node child) { + @Override + public Node apply(Node child) { Node node = null; if (type == OpType.POSTFIX) { node = new ASTNode( @@ -364,14 +365,15 @@ public UnaryParseMap(String opr, String pluginName, OpType type) { this.type = type; } - public UnaryMap map(Object[] v) { + @Override + public UnaryMap apply(Object[] v) { return new UnaryMap(opr, pluginName, type, v); } } /* Special binary map class */ - public static class BinaryMap implements Binary { + public static class BinaryMap implements BinaryOperator { //private String pluginNames; private String opr; @@ -397,7 +399,8 @@ public BinaryMap(String opr, String pluginNames, OpType type, Object[] cnodes) { /** * Creates a tree for this operator with an {@link ASTNode} as its root. */ - public Node map(Node o1, Node o2) { + @Override + public Node apply(Node o1, Node o2) { Node node = new ASTNode( null, ASTNode.BINARY_OPERATOR_CLASS, "", ((Node)cnodes[1]).getToken(), o1.getScannerInfo()); node.addChild(o1); @@ -423,14 +426,15 @@ public BinaryParseMap(String opr, String pluginName, OpType type) { this.type = type; } - public BinaryMap map(Object[] v) { + @Override + public BinaryMap apply(Object[] v) { return new BinaryMap(opr, pluginName, type, v); } } /* Special index map class */ - public static class IndexMap implements Unary { + public static class IndexMap implements UnaryOperator { //private String pluginNames; private String opr1; @@ -458,7 +462,8 @@ public IndexMap(String opr1, String opr2, String pluginNames, OpType type, Objec /** * Creates a tree for this operator with an {@link ASTNode} as its root. */ - public Node map(Node child) { + @Override + public Node apply(Node child) { Node node = null; node = new ASTNode( null, ASTNode.INDEX_OPERATOR_CLASS, "", opr1 + OperatorRule.OPERATOR_DELIMITER + opr2, child.getScannerInfo()); @@ -484,7 +489,8 @@ public IndexParseMap(String opr1, String opr2, String pluginName, OpType type) { this.type = type; } - public IndexMap map(Object[] v) { + @Override + public IndexMap apply(Object[] v) { return new IndexMap(opr1, opr2, pluginName, type, v); } diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/ImportRuleParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/ImportRuleParseMap.java index 8a946761..df06404f 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/ImportRuleParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/ImportRuleParseMap.java @@ -31,7 +31,8 @@ public ImportRuleParseMap() { super(Kernel.PLUGIN_NAME); } - public Node map(Object[] v) { + @Override + public Node apply(Object[] v) { Node node = new ASTNode( null, ASTNode.RULE_CLASS, diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java index f3b7adfb..45ddf4d5 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java @@ -314,8 +314,9 @@ public Map getParsers() { parserTools.getKeywParser("use", this.getName()), idParser, new ParseMap2(getName()) { - - public Node map(Node a, Node b) { + + @Override + public Node apply(Node a, Node b) { Node node = new ASTNode( pluginName, ASTNode.DECLARATION_CLASS, @@ -337,8 +338,9 @@ public Node map(Node a, Node b) { parserTools.getKeywParser("init", this.getName()), idParser, new ParseMap2(getName()) { - - public Node map(Node a, Node b) { + + @Override + public Node apply(Node a, Node b) { Node node = new ASTNode( null, null, @@ -448,7 +450,8 @@ private void createRuleParser(Map parsers) { // Rule : 'skip' Parser skipRuleParser = parserTools.getKeywParser("skip", PLUGIN_NAME).map( new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { return new SkipRuleNode(v.getScannerInfo()); }}); parsers.put("SkipRule", new GrammarRule("SkipRule", "'skip'", skipRuleParser, PLUGIN_NAME)); @@ -471,7 +474,8 @@ public Node map(Node v) { Parser macroCallRule = Parsers.array(refFuncRuleTermParser.lazy()).map( new ParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new MacroCallRuleNode(((Node)vals[0]).getScannerInfo()); node.addChild("alpha", (Node)vals[0]); return node; @@ -613,7 +617,8 @@ private Parser createExpressionParser() { parserTools.getKeywParser("undef", PLUGIN_NAME), parserTools.getKeywParser("self", PLUGIN_NAME)).map( new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { Node node = new ASTNode( pluginName, ASTNode.EXPRESSION_CLASS, @@ -633,7 +638,8 @@ public Node map(Node v) { parserTools.getKeywParser("true", PLUGIN_NAME), parserTools.getKeywParser("false", PLUGIN_NAME)).map( new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { Node node = new ASTNode( pluginName, ASTNode.EXPRESSION_CLASS, @@ -659,7 +665,8 @@ public Node map(Node v) { parserTools.getOprParser(")") ).map(new ParseMap(PLUGIN_NAME){ - public Node map(Object[] v) { + @Override + public Node apply(Object[] v) { Node node = new EnclosedTermNode(((Node)v[0]).getScannerInfo()); for (Object o:v) node.addChild((Node)o); return node; @@ -739,7 +746,8 @@ private void createBasicTerm(Parser functionRuleTermParser) { new ParseMap2(PLUGIN_NAME) { - public Node map(Node a, Node b) { + @Override + public Node apply(Node a, Node b) { Node node = new ASTNode( pluginName, ASTNode.EXPRESSION_CLASS, @@ -764,7 +772,8 @@ public Node map(Node a, Node b) { idParser, new ParseMap2(PLUGIN_NAME) { - public Node map(Node a, Node d) { + @Override + public Node apply(Node a, Node d) { Node node = new RuleOrFuncElementNode(a.getScannerInfo()); node.addChild(a); node.addChild("alpha", d); diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/TupleTermParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/TupleTermParseMap.java index 98209dd5..4f25c7f1 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/TupleTermParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/TupleTermParseMap.java @@ -28,8 +28,9 @@ public class TupleTermParseMap extends ParseMap { public TupleTermParseMap() { super(Kernel.PLUGIN_NAME); } - - public Node map(Object[] v) { + + @Override + public Node apply(Object[] v) { Node node = new ASTNode( null, "", diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/UpdateRuleParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/UpdateRuleParseMap.java index cac243f2..3013ef38 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/UpdateRuleParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/UpdateRuleParseMap.java @@ -28,7 +28,8 @@ public UpdateRuleParseMap() { super(Kernel.PLUGIN_NAME); } - public Node map(Object[] v) { + @Override + public Node apply(Object[] v) { Node node = new UpdateRuleNode(((Node)v[0]).getScannerInfo()); for (int i=0; i < v.length; i++) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java index 115dbff4..63392c5c 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap.java @@ -15,16 +15,16 @@ import org.coreasm.engine.plugin.Plugin; -import org.jparsec.functors.Map; +import java.util.function.Function; /** - * Specialized version of {@link Map} that gets a plug-in name as well. + * Specialized version that gets a plug-in name as well. * * @author Roozbeh Farahbod * */ -public abstract class ParseMap implements Map { +public abstract class ParseMap implements Function { public final String pluginName; diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java index 4937be58..19de524b 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParseMap2.java @@ -3,16 +3,16 @@ import org.coreasm.engine.interpreter.Node; import org.coreasm.engine.plugin.Plugin; -import org.jparsec.functors.Map2; +import java.util.function.BiFunction; /** - * Specialized version of {@link Map3} that gets a plug-in name as well. + * Specialized version that gets a plug-in name as well. * * @author Roozbeh Farahbod * */ -public abstract class ParseMap2 implements Map2 { +public abstract class ParseMap2 implements BiFunction { public final String pluginName; diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index b3db01be..b4c5c3b9 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -1,6 +1,7 @@ package org.coreasm.engine.parser; import java.util.*; +import java.util.function.Function; import org.jparsec.Parser; import org.jparsec.Parsers; @@ -8,7 +9,6 @@ import org.jparsec.Terminals; import org.jparsec.Token; import org.jparsec.Tokens.Fragment; -import org.jparsec.functors.Map; import org.coreasm.engine.ControlAPI; import org.coreasm.engine.EngineError; import org.coreasm.engine.interpreter.ASTNode; @@ -92,18 +92,15 @@ public Parser getIdParser() { public Parser getKeywParser(String keyword, final String pluginName) { if ( ! keywParsers.containsKey(keyword) ) { - Parser parser = terminals_keyw.token(keyword).map(new Map() { - @Override - public Node map(Token from) { - int index = from.index(); - return new Node( - pluginName, - from.toString(), - new ScannerInfo(index), - Node.KEYWORD_NODE - ); - } - }); + Parser parser = terminals_keyw.token(keyword).map(from -> { + int index = from.index(); + return new Node( + pluginName, + from.toString(), + new ScannerInfo(index), + Node.KEYWORD_NODE + ); + }); keywParsers.put(keyword, parser); } return keywParsers.get(keyword); @@ -111,18 +108,15 @@ public Node map(Token from) { public Parser getOprParser(String operator) { if ( ! oprParsers.containsKey(operator) ) { - Parser parser = terminals_keyw.token(operator).map(new Map() { - @Override - public Node map(Token from) { - int index = from.index(); - return new Node( - "Kernel", - from.toString(), - new ScannerInfo(index), - Node.OPERATOR_NODE - ); - } - }); + Parser parser = terminals_keyw.token(operator).map(from -> { + int index = from.index(); + return new Node( + "Kernel", + from.toString(), + new ScannerInfo(index), + Node.OPERATOR_NODE + ); + }); oprParsers.put(operator, parser); } return oprParsers.get(operator); @@ -141,7 +135,7 @@ public Parser getIgnored() { public static abstract class ArrayParseMap - implements Map + implements Function { String pluginname; @@ -152,9 +146,10 @@ public ArrayParseMap(String pluginname) { public ArrayParseMap(Plugin plugin) { this(plugin.getName()); } - - public abstract Node map(Object[] from); - + + @Override + public abstract Node apply(Object[] from); + /** * Assumes all the children are instances of {@link Node} and * adds all of them as children of parent. @@ -187,7 +182,6 @@ public void addChildren(Node parent, Object[] children) { public void addChild(Node parent, Node child) { parent.addChild(child); } - } @@ -200,7 +194,7 @@ public RuleSignatureParseMap() { } @Override - public Node map(Object[] from) { + public Node apply(Object[] from) { Node node = new ASTNode( "Kernel", ASTNode.DECLARATION_CLASS, @@ -221,8 +215,9 @@ public static class RuleDeclarationParseMap public RuleDeclarationParseMap() { super(Kernel.PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { ScannerInfo info = null; info = ((Node)vals[0]).getScannerInfo(); @@ -261,8 +256,9 @@ public static class CoreASMParseMap public CoreASMParseMap() { super(Kernel.PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { ScannerInfo info = null; // consider the possiblity of starting with a @@ -296,8 +292,9 @@ public static class FunctionRuleTermParseMap public FunctionRuleTermParseMap() { super(Kernel.PLUGIN_NAME); } - - public Node map(Object[] v) { + + @Override + public Node apply(Object[] v) { Node node = new FunctionRuleTermNode(((Node)v[0]).getScannerInfo()); node.addChild("alpha", (Node)v[0]); // ID @@ -324,7 +321,8 @@ public IdentifierMap() { super("Kernel"); } - public Node map(Token v) + @Override + public Node apply(Token v) { return new ASTNode( pluginName, @@ -404,12 +402,7 @@ public Parser many(Parser parser) { */ public Parser many(String name, Parser parser) { //Parser result = Parsers.many(name, Object.class, parser); - Parser result = parser.many().map( new Map, Object[]>() { - @Override - public Object[] map(List from) { - return from.toArray(); - } - }); + Parser result = parser.many().map(from -> from.toArray()); return result; } @@ -492,7 +485,6 @@ public Parser plus(Parser parser) { * * @param name name of the new parser * @param parser parser to be repeated at least once - * @param delimiter the delimiter parser [REMOVED] */ public Parser plus(String name, Parser parser) { /*Parser result = seq(name, parser, delimiter).many1(Object[].class).map( @@ -507,12 +499,7 @@ public Object[] map(Object[][] v) { } } );*/ - Parser result = parser.many1().map(new Map, Object[]> () { - @Override - public Object[] map(List from) { - return from.toArray(); - } - }); + Parser result = parser.many1().map(from -> from.toArray()); return result; } diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java index ec5b03ef..d55206c4 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/abstraction/AbstractionPlugin.java @@ -116,7 +116,7 @@ public Map getParsers() { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] vals) { + public Node apply(Object[] vals) { Node node = new AbstractRuleNode(((Node)vals[0]).getScannerInfo()); node.addChild((Node) vals[0]); node.addChild("alpha", (Node)vals[1]); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java index 81b1b5a7..950eb3f5 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/activation/ActivationPlugin.java @@ -141,7 +141,8 @@ public Map getParsers() { Parser activateParser = Parsers .array(new Parser[] { pTools.getKeywParser("activate", PLUGIN_NAME), funcRuleTermParser }) .map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ActivationNode(((Node) vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -150,7 +151,8 @@ public Node map(Object[] vals) { Parser deactivateParser = Parsers .array(new Parser[] { pTools.getKeywParser("deactivate", PLUGIN_NAME), funcRuleTermParser }) .map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ActivationNode(((Node) vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java index 53b67481..cc7ec599 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java @@ -1087,8 +1087,9 @@ public static class BagEnumerateParseMap extends ParserTools.ArrayParseMap { public BagEnumerateParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { Node node = new BagEnumerateNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -1101,8 +1102,9 @@ public static class BagComprehensionParseMap extends ArrayParseMap { public BagComprehensionParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { Node node = null; // if there is an 'is' clause if (vals[1] != null && vals[1] instanceof Object[]) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java index 37a03aba..da9c5602 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/blockrule/BlockRulePlugin.java @@ -149,7 +149,7 @@ public Map getParsers() { ).map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] from) { + public Node apply(Object[] from) { ASTNode node = new ASTNode( BlockRulePlugin.PLUGIN_NAME, ASTNode.RULE_CLASS, diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java index 796ec385..fbcde8fb 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/caserule/CaseRulePlugin.java @@ -197,7 +197,8 @@ public CaseParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { nextChildName = "alpha"; Node node = new CaseRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java index fdcf264b..e3a6bd4e 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java @@ -164,7 +164,8 @@ public Map getParsers() { termParser).optional() }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new PickExpNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -729,8 +730,9 @@ public static class ChooseParseMap extends ParserTools.ArrayParseMap { public ChooseParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] v) { + + @Override + public Node apply(Object[] v) { nextChildName = "alpha"; ASTNode node = new ChooseRuleNode(((Node)v[0]).getScannerInfo()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java index 117e3325..94c9c876 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/collection/CollectionPlugin.java @@ -136,7 +136,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new AddToRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -156,7 +157,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new RemoveFromRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java index bd35844d..5ab655d4 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java @@ -188,12 +188,13 @@ public Map getParsers() { termParser, pTools.getKeywParser("else", PLUGIN_NAME), termParser).map(new ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { - Node node = new ConditionalTermNode(((Node)vals[0]).getScannerInfo()); - addChildren(node, vals); - return node; - } - }); + @Override + public Node apply(Object[] vals) { + Node node = new ConditionalTermNode(((Node)vals[0]).getScannerInfo()); + addChildren(node, vals); + return node; + } + }); parsers.put("BasicTerm", new GrammarRule("ConditionalTerm", "'if' Term 'then' Term 'else' Term", condTermParser, PLUGIN_NAME)); @@ -225,7 +226,7 @@ public ConditionalParseMap() { } @Override - public Node map(Object[] vals) { + public Node apply(Object[] vals) { nextChildName = "guard"; Node node = new ConditionalRuleNode(((Node) vals[0]).getScannerInfo()); addChildren(node, vals); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java index 48c1032b..bc89569c 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/debuginfo/DebugInfoPlugin.java @@ -163,7 +163,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new DebugInfoNode(((Node)vals[0]).getScannerInfo()); node.addChild((Node)vals[0]); node.addChild("alpha", (Node)vals[1]); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java index af082a24..eff2d058 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/extendrule/ExtendRulePlugin.java @@ -179,7 +179,8 @@ public ExtendParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ExtendRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java index 0d756d2a..192b4924 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java @@ -323,7 +323,8 @@ public ForallParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { nextChildName = "alpha"; Node node = new ForallRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java index 17f8ba8d..24b34c73 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java @@ -313,7 +313,8 @@ public ForeachParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { nextChildName = "alpha"; Node node = new ForeachRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java index bb9ddc15..16176abe 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java @@ -230,23 +230,21 @@ public Map getParsers() { npTools.getKeywParser(KEYWORD_INTO, PLUGIN_NAME), npTools.getOprParser(OPERATOR_LINUX_INTO)), termParser).optional() - }).map(new org.jparsec.functors.Map() { - public Node map(Object[] vals) { - if (vals[2] == null) { - Node node = new PrintRuleNode(((Node) vals[0]).getScannerInfo()); - node.addChild((Node) vals[0]); - node.addChild("alpha", (Node) vals[1]); - return node; - } - Node node = new PrintToFileRuleNode(((Node) vals[0]).getScannerInfo()); - node.addChild((Node) vals[0]); - node.addChild("alpha", (Node) vals[1]); - Object[] toPart = (Object[]) vals[2]; - node.addChild((Node) toPart[0]); - node.addChild("beta", (Node) toPart[1]); - return node; - } - }); + }).map(vals -> { + if (vals[2] == null) { + Node node = new PrintRuleNode(((Node) vals[0]).getScannerInfo()); + node.addChild((Node) vals[0]); + node.addChild("alpha", (Node) vals[1]); + return node; + } + Node node = new PrintToFileRuleNode(((Node) vals[0]).getScannerInfo()); + node.addChild((Node) vals[0]); + node.addChild("alpha", (Node) vals[1]); + Object[] toPart = (Object[]) vals[2]; + node.addChild((Node) toPart[0]); + node.addChild("beta", (Node) toPart[1]); + return node; + }); parsers.put("Rule", diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java index c30dc95b..eb8f9e7c 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/kernelextensions/KernelExtensionsPlugin.java @@ -143,7 +143,8 @@ public Map getParsers() { tupleTermParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ExtendedFunctionRuleTermNode(((Node)vals[0]).getScannerInfo()); addChild(node, (new FunctionRuleTermParseMap()).map((Node)vals[0], (Node)vals[1])); for (Node n: ((Node)vals[2]).getChildNodes()) @@ -164,7 +165,8 @@ public Node map(Object[] vals) { pTools.getOprParser(")"), tupleTermParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ExtendedFunctionRuleTermNode(((Node)vals[0]).getScannerInfo()); for (int i = 0; i < 3; i++) if (vals[i] != null) @@ -190,7 +192,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ExtendedRuleCallNode(((Node)vals[0]).getScannerInfo()); addChild(node, (Node)vals[0]); for (NameNodeTuple nt: ((Node)vals[1]).getChildNodesWithNames()) diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java index 99857ef0..fc41743a 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/letrule/LetRulePlugin.java @@ -313,8 +313,9 @@ public LetRuleParseMap() { } String nextChildName = "alpha"; - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { nextChildName = "alpha"; LetRuleNode node = new LetRuleNode(((Node)vals[0]).getScannerInfo()); if (vals[1] instanceof Object[] && ((Object[])vals[1])[0] instanceof Node) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java index 3b215a84..a4eb3d7f 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java @@ -237,7 +237,7 @@ public Map getParsers() { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] vals) { + public Node apply(Object[] vals) { Node node = new ListTermNode(); addChildren(node, vals); node.setScannerInfo(node.getFirstCSTNode()); @@ -274,7 +274,7 @@ public void addChild(Node parent, Node child) { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] vals) { + public Node apply(Object[] vals) { boolean isLeft = ((Node)vals[1]).getToken().equals("left"); Node node = new ShiftRuleNode(((Node)vals[0]).getScannerInfo(), isLeft); addChildren(node, vals); @@ -717,8 +717,9 @@ public static class ListComprehensionParseMap extends ParserTools.ArrayParseMap public ListComprehensionParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { Node node = new ListCompNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java index 825e9d8e..190ff4d9 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java @@ -185,7 +185,7 @@ public Map getParsers() { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] vals) { + public Node apply(Object[] vals) { ASTNode node = new MapletNode((Node)vals[0]); addChildren(node, vals); return node; @@ -205,7 +205,7 @@ public Node map(Object[] vals) { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] vals) { + public Node apply(Object[] vals) { Node node = new MapTermNode((Node)vals[0]); addChildren(node, vals); return node; @@ -537,8 +537,9 @@ public static class MapComprehensionParseMap extends ParserTools.ArrayParseMap { public MapComprehensionParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { Node node = new MapCompNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java index e54b8d7e..72687106 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/math/MathPlugin.java @@ -194,7 +194,8 @@ public Map getParsers() { pTools.getKeywParser(KW_RANDOM_VALUE, PLUGIN_NAME).map( new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { Node node = new ASTNode( PLUGIN_NAME, ASTNode.EXPRESSION_CLASS, diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java index c8035601..1842b7d1 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java @@ -29,8 +29,9 @@ public class CoreModuleParseMap extends ParserTools.ArrayParseMap { public CoreModuleParseMap() { super(ModularityPlugin.PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { ScannerInfo info = null; // consider the possibility of starting with a diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java index 6bb93fe0..b5b1d5c5 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/ModularityPlugin.java @@ -188,7 +188,7 @@ public Map getParsers() { stringParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] from) { + public Node apply(Object[] from) { int index = -1; if (from[0]!=null && from[0] instanceof Token) index = ((Token)from[0]).index(); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java index 4542a4d5..011838b2 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java @@ -264,14 +264,7 @@ public Set> getLexers() { Pattern pDigits = Patterns.range('0', '9').many1(); Pattern pFloat = pDigits.next(Patterns.isChar('.').next(pDigits).optional()); Parser sFloat = pFloat.toScanner("NUMBER").source(); - tokenizer_nr = sFloat.map( - new org.jparsec.functors.Map() { - @Override - public Fragment map(String from) { - return Tokens.fragment(from, Tag.DECIMAL); - } - } - ); + tokenizer_nr = sFloat.map(from -> Tokens.fragment(from, Tag.DECIMAL)); lexers.add(tokenizer_nr); } return lexers; @@ -311,7 +304,8 @@ public Map getParsers() { termParser).optional(), pTools.getOprParser("]") }).map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new NumberRangeNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -330,7 +324,8 @@ public Node map(Object[] vals) { termParser, pTools.getOprParser("|") }).map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new SizeOfEnumNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -358,12 +353,7 @@ private Parser createNumberParser() { if (refNumberTermParser.get() == null) { Parser nrParser = Terminals.fragment(Tag.DECIMAL).token().map( - new org.jparsec.functors.Map () { - @Override - public Node map(Token from) { - return new NumberTermNode(new ScannerInfo(from), from.toString()); - } - } + from -> new NumberTermNode(new ScannerInfo(from), from.toString()) ); refNumberTermParser.set(nrParser); } diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java index 57a6a250..27d819f0 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java @@ -143,7 +143,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { String str = objectToString(vals); return new ASTNode( PLUGIN_NAME, @@ -194,7 +195,8 @@ public Node fromToken(Tok tok) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new OptionNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java index 13b06844..ec777b79 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java @@ -149,7 +149,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new PlotRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java index b456fc54..00317f34 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/predicatelogic/PredicateLogicPlugin.java @@ -319,7 +319,8 @@ public Map getParsers() { termParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ForallExpNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -340,7 +341,8 @@ public Node map(Object[] vals) { termParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ExistsExpNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java index 2cdd2241..fa82aef5 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java @@ -170,8 +170,9 @@ public static class PropertyParseMap extends ParserTools.ArrayParseMap { public PropertyParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { PropertyListNode node = new PropertyListNode(null); addChildren(node, vals); node.setScannerInfo(node.getFirstCSTNode()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java index a47406d2..84b9d6c7 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/queue/QueuePlugin.java @@ -114,7 +114,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new EnqueueRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -134,7 +135,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new DequeueRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java index 089e317c..43fdf798 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/schedulingpolicies/SchedulingPoliciesPlugin.java @@ -203,7 +203,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new AgentManagementRuleNode(((Node)vals[0]).getScannerInfo(), "SuspendAgentRule"); node.addChild((Node)vals[0]); node.addChild("alpha", (Node)vals[1]); @@ -220,7 +221,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new AgentManagementRuleNode(((Node)vals[0]).getScannerInfo(), "ResumeAgentRule"); node.addChild((Node)vals[0]); node.addChild("alpha", (Node)vals[1]); @@ -237,7 +239,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new AgentManagementRuleNode(((Node)vals[0]).getScannerInfo(), "TerminateAgentRule"); node.addChild((Node)vals[0]); node.addChild("alpha", (Node)vals[1]); @@ -251,7 +254,8 @@ public Node map(Object[] vals) { pTools.getKeywParser(SHUTDOWN_KEYWORD, PLUGIN_NAME).map( new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { Node node = new AgentManagementRuleNode(v.getScannerInfo(), "ShutdownRule"); node.addChild(v); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java index cd658afe..b415ce75 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java @@ -1143,8 +1143,9 @@ public static class SetEnumerateParseMap extends ParserTools.ArrayParseMap { public SetEnumerateParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { Node node = new SetEnumerateNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -1157,8 +1158,9 @@ public static class SetComprehensionParseMap extends ParserTools.ArrayParseMap { public SetComprehensionParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { Node node = null; // if there is an 'is' clause if (vals[1] != null && vals[1] instanceof Object[]) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java index fa569cce..3ad291f2 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java @@ -210,7 +210,8 @@ public Map getParsers() { pTools.getOprParser("}"), }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new EnumerationNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -233,7 +234,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new UniverseNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -257,7 +259,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ASTNode( SignaturePlugin.PLUGIN_NAME, ASTNode.DECLARATION_CLASS, @@ -279,7 +282,8 @@ public Node map(Object[] vals) { pTools.getKeywParser("static", PLUGIN_NAME), pTools.getKeywParser("monitored", PLUGIN_NAME)).map(new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { return new ASTNode( SignaturePlugin.PLUGIN_NAME, ASTNode.DECLARATION_CLASS, @@ -315,7 +319,8 @@ public Node map(Node v) { ).optional() }).map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new FunctionNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -335,7 +340,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { ScannerInfo info = null; if (vals[0] != null) info = ((Node)((Object[])vals[0])[0]).getScannerInfo(); @@ -360,7 +366,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ASTNode( SignaturePlugin.PLUGIN_NAME, ASTNode.DECLARATION_CLASS, diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java index 5491020f..5501f481 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/stack/StackPlugin.java @@ -119,7 +119,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new PushRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -139,7 +140,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new PopRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java index 109e43aa..0d376746 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java @@ -132,7 +132,8 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new StepRuleNode(((Node)vals[0]).getScannerInfo()); boolean first = true; for (Object o: vals) { @@ -165,7 +166,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new StepBlockRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java index 45add68a..3f18ff3f 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/string/StringPlugin.java @@ -152,12 +152,7 @@ public Map getParsers() { parsers = new HashMap(); Parser stringParser = Terminals.StringLiteral.PARSER.token().map( - new org.jparsec.functors.Map() { - @Override - public Node map(Token from) { - return new StringNode(StringElement.processEscapeCharacters(from.toString()), new ScannerInfo(from)); - } - } + from -> new StringNode(StringElement.processEscapeCharacters(from.toString()), new ScannerInfo(from)) ); refStringTermParser.set(stringParser); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java index 452f946f..e9ac9fb7 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/testing/TestingPlugin.java @@ -65,7 +65,7 @@ public Map getParsers() { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] from) { + public Node apply(Object[] from) { Node node = new ASTNode(PLUGIN_NAME, ASTNode.EXPRESSION_CLASS, "PARAM", null, ((Node) from[0]).getScannerInfo()); addChildren(node, from); return node; @@ -79,7 +79,7 @@ public Node map(Object[] from) { paramkeyw, pTools.getIdParser() }).map(new ArrayParseMap(PLUGIN_NAME){ - public Node map(Object[] vals){ + public Node apply(Object[] vals){ Node node = new ASTNode(PLUGIN_NAME, ASTNode.RULE_CLASS, "PARAM", null, ((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -121,7 +121,7 @@ public TestingParseMap(){ } @Override - public Node map(Object[] vals){ + public Node apply(Object[] vals){ Node node = new ASTNode(PLUGIN_NAME, ASTNode.RULE_CLASS, "TestRule", null, ((Node) vals[0]).getScannerInfo()); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java index c220d34d..013eeeb3 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java @@ -218,7 +218,8 @@ public Node map(Object[] vals) { termParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new MakeTreeRuleNode(); addChildren(node, vals); return node; @@ -249,7 +250,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new AddChildToRuleNode(); addChildren(node, vals); return node; @@ -276,7 +278,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new RemoveChildFromRuleNode(); addChildren(node, vals); return node; @@ -303,7 +306,8 @@ public Node map(Object[] vals) { }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new RemoveChildAtRuleNode(); addChildren(node, vals); return node; diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java index 1291bb60..d9d07de2 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java @@ -201,7 +201,8 @@ public Map getParsers() { ruleParser, }).map( new ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new IterateRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -232,7 +233,8 @@ public Node map(Object[] vals) { }).map( new ArrayParseMap(PLUGIN_NAME) { - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { Node node = new ReturnResultNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; @@ -289,7 +291,8 @@ public Node map(Object[] vals) { Parser resultLocationParser = //Parsers.map("ResultLocation", pTools.getKeywParser(RESULT_KEYWORD, PLUGIN_NAME).map( new ParseMap(PLUGIN_NAME) { - public Node map(Node v) { + @Override + public Node apply(Node v) { /* * Here we do a little bit of cheating! :-) * We basically make 'result' act as an identifier. @@ -589,7 +592,8 @@ public WhileParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { nextChildName = "cond"; Node node = new WhileRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); @@ -614,7 +618,8 @@ public LocalRuleParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { nextChildName = "lambda"; Node node = new LocalRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); @@ -641,7 +646,8 @@ public ReturnTermParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] vals) { + @Override + public Node apply(Object[] vals) { nextChildName = "alpha"; Node node = new ReturnTermNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); @@ -665,8 +671,9 @@ public static class SeqRuleParseMap extends ArrayParseMap { public SeqRuleParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { SeqRuleNode node = new SeqRuleNode(((Node)vals[0]).getScannerInfo()); ArrayList nodes = new ArrayList(); int i = unpackChildren(nodes, vals); diff --git a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java index f722a91d..e916a1d5 100755 --- a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java @@ -269,25 +269,22 @@ private Parser getBasicJavaIdParser() { ParserTools.getInstance(capi); Parser tokp = Parsers.ANY_TOKEN.token(); - basicJavaIdParser = tokp.map( new org.jparsec.functors.Map() { - @Override - public Node map(Token from) { - if (from.value() instanceof Tokens.Fragment) { - Tokens.Fragment frag = (Fragment) from.value(); - if (frag.tag() == Tokens.Tag.IDENTIFIER || frag.tag() == Tokens.Tag.RESERVED) { - return new ASTNode( - "Jasemine", - ASTNode.ID_CLASS, - "BasicJavaID", - from.toString(), - new ScannerInfo(from), - Node.OTHER_NODE - ); - } // else... - } // else... - return null; - } - }); + basicJavaIdParser = tokp.map(from -> { + if (from.value() instanceof Fragment) { + Fragment frag = (Fragment) from.value(); + if (frag.tag() == Tokens.Tag.IDENTIFIER || frag.tag() == Tokens.Tag.RESERVED) { + return new ASTNode( + "Jasemine", + ASTNode.ID_CLASS, + "BasicJavaID", + from.toString(), + new ScannerInfo(from), + Node.OTHER_NODE + ); + } // else... + } // else... + return null; + }); } return basicJavaIdParser; @@ -1229,7 +1226,8 @@ public JavaIdParseMap() { super(PLUGIN_NAME); } - public Node map(Object[] nodes) { + @Override + public Node apply(Object[] nodes) { ASTNode node = new ASTNode( PLUGIN_NAME, ASTNode.ID_CLASS, @@ -1368,8 +1366,9 @@ private static class InvokeParseMap extends ParserTools.ArrayParseMap { public InvokeParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { resultSeen = false; Node node = new InvokeRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); @@ -1405,8 +1404,9 @@ private static class StoreParseMap extends ParserTools.ArrayParseMap { public StoreParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] nodes) { + + @Override + public Node apply(Object[] nodes) { Node node = new StoreRuleNode(((Node)nodes[0]).getScannerInfo()); addChildren(node, nodes); return node; @@ -1423,8 +1423,9 @@ private static class NativeImportParseMap extends ParserTools.ArrayParseMap { public NativeImportParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] vals) { + + @Override + public Node apply(Object[] vals) { nextIsLocation = false; Node node = new NativeImportRuleNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); diff --git a/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java b/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java index 752994a9..72464319 100755 --- a/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java @@ -305,7 +305,7 @@ public Map getParsers() { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] nodes) { + public Node apply(Object[] nodes) { NewEdgeNode node = new NewEdgeNode(((Node)nodes[0]).getScannerInfo()); addChildren(node, nodes); return node; @@ -322,7 +322,7 @@ public Node map(Object[] nodes) { new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override - public Node map(Object[] nodes) { + public Node apply(Object[] nodes) { ShowGraphNode node = new ShowGraphNode(((Node)nodes[0]).getScannerInfo()); addChildren(node, nodes); return node; diff --git a/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java b/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java index 84e2cde1..136a43ca 100755 --- a/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java @@ -402,8 +402,9 @@ public static class SignalRuleParseMap extends ParserTools.ArrayParseMap { public SignalRuleParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] v) { + + @Override + public Node apply(Object[] v) { nextChildName = "alpha"; ASTNode node = new SignalRuleNode(((Node)v[0]).getScannerInfo()); @@ -436,8 +437,9 @@ public static class OnSignalRuleParseMap extends ParserTools.ArrayParseMap { public OnSignalRuleParseMap() { super(PLUGIN_NAME); } - - public Node map(Object[] v) { + + @Override + public Node apply(Object[] v) { ASTNode node = new OnSignalRuleNode(((Node)v[0]).getScannerInfo()); addChildren(node, v); return node; From fa1b409b79d278d06faa3015be620fdb5bcdda92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Wed, 6 Feb 2019 11:52:16 +0100 Subject: [PATCH 07/13] fix deprecation of optional without default value --- .../coreasm/engine/kernel/ExpressionParserFactory.java | 2 +- .../src/org/coreasm/engine/kernel/Kernel.java | 6 +++--- .../src/org/coreasm/engine/plugins/bag/BagPlugin.java | 6 +++--- .../engine/plugins/chooserule/ChooseRulePlugin.java | 8 ++++---- .../plugins/conditionalrule/ConditionalRulePlugin.java | 4 ++-- .../engine/plugins/forallrule/ForallRulePlugin.java | 6 +++--- .../engine/plugins/foreachrule/ForeachRulePlugin.java | 6 +++--- .../src/org/coreasm/engine/plugins/io/IOPlugin.java | 2 +- .../org/coreasm/engine/plugins/list/ListPlugin.java | 4 ++-- .../src/org/coreasm/engine/plugins/map/MapPlugin.java | 2 +- .../coreasm/engine/plugins/number/NumberPlugin.java | 2 +- .../coreasm/engine/plugins/options/OptionsPlugin.java | 2 +- .../coreasm/engine/plugins/plotter/PlotterPlugin.java | 2 +- .../engine/plugins/property/PropertyPlugin.java | 2 +- .../src/org/coreasm/engine/plugins/set/SetPlugin.java | 6 +++--- .../engine/plugins/signature/SignaturePlugin.java | 10 +++++----- .../org/coreasm/engine/plugins/step/StepPlugin.java | 2 +- .../org/coreasm/engine/plugins/tree/TreePlugin.java | 2 +- .../engine/plugins/turboasm/TurboASMPlugin.java | 8 ++++---- .../src/org/coreasm/jasmine/plugin/JasminePlugin.java | 4 ++-- .../org/coreasm/network/plugins/graph/GraphPlugin.java | 2 +- .../coreasm/network/plugins/signals/SignalsPlugin.java | 2 +- 22 files changed, 45 insertions(+), 45 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java index 94517270..1850e200 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java @@ -233,7 +233,7 @@ private Parser createUnaryParser(String opr, String pluginNames, OpTyp private Parser createIndexParser(String opr1, String opr2, String pluginNames) { return ParserTools.seq( ParserTools.getOprParser(opr1), - termParser.optional(), + termParser.optional(null), ParserTools.getOprParser(opr2) ).map(new IndexParseMap(opr1, opr2, pluginNames, OpType.INDEX)); } diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java index 45ddf4d5..a35d2240 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java @@ -364,7 +364,7 @@ public Node apply(Node a, Node b) { parserTools.getOprParser("("), parserTools.csplus(idParser), parserTools.getOprParser(")") - ).optional(), + ).optional(null), }).map(new ParserTools.RuleSignatureParseMap()); refRuleSignatureParser.set(rulesignParser); parsers.put("RuleSignature", new GrammarRule("RuleSignature", "ID ( '(' ID (',' ID)* ')' )?", refRuleSignatureParser.lazy(), this.getName())); @@ -533,7 +533,7 @@ private Parser createTermParser(Map parsers) { // TupleTerm: '(' ( Term ( ',' Term )* )? ')' Parser ttParser = Parsers.array( //parserTools.seq( parserTools.getOprParser("("), - parserTools.csplus(refTermParser.lazy()).optional(), + parserTools.csplus(refTermParser.lazy()).optional(null), parserTools.getOprParser(")") ).map(new TupleTermParseMap()); refTupleTermParser.set(ttParser); @@ -565,7 +565,7 @@ private void createFunctionRuleTermParser() { Parser basicFunctionRuleTermParser = Parsers.array( new Parser[] { idParser, - refTupleTermParser.lazy().optional() + refTupleTermParser.lazy().optional(null) }).map(new ParserTools.FunctionRuleTermParseMap()); parsers.put("BasicFunctionRuleTerm", new GrammarRule("BasicFunctionRuleTerm", diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java index cc7ec599..cc69c445 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java @@ -457,7 +457,7 @@ public Map getParsers() { Parser bagEnumerateParser = Parsers.array( new Parser[] { pTools.getOprParser(BAG_OPEN_SYMBOL), - pTools.csplus(termParser).optional(), + pTools.csplus(termParser).optional(null), pTools.getOprParser(BAG_CLOSE_SYMBOL) }).map( new BagEnumerateParseMap()); @@ -479,7 +479,7 @@ public Map getParsers() { ), Parsers.array( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getOprParser(BAG_CLOSE_SYMBOL) }), Parsers.array(new Parser[] { @@ -496,7 +496,7 @@ public Map getParsers() { ), Parsers.array( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getOprParser(BAG_CLOSE_SYMBOL) }) ).map(new BagComprehensionParseMap()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java index e3a6bd4e..3032c2af 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/chooserule/ChooseRulePlugin.java @@ -139,13 +139,13 @@ public Map getParsers() { termParser)), npTools.seq( npTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), npTools.getKeywParser("do", PLUGIN_NAME), ruleParser, npTools.seq( npTools.getKeywParser("ifnone", PLUGIN_NAME), - ruleParser).optional(), - npTools.getKeywParser("endchoose", PLUGIN_NAME).optional()).map( + ruleParser).optional(null), + npTools.getKeywParser("endchoose", PLUGIN_NAME).optional(null)).map( new ChooseParseMap()); parsers.put("Rule", new GrammarRule("Rule", @@ -161,7 +161,7 @@ public Map getParsers() { termParser, npTools.seq( npTools.getKeywParser("with", PLUGIN_NAME), - termParser).optional() + termParser).optional(null) }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java index 5ab655d4..b884eeaf 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/conditionalrule/ConditionalRulePlugin.java @@ -174,8 +174,8 @@ public Map getParsers() { ruleParser, Parsers.array( pTools.getKeywParser("else", PLUGIN_NAME), - ruleParser).optional(), - pTools.getKeywParser("endif", PLUGIN_NAME).optional() + ruleParser).optional(null), + pTools.getKeywParser("endif", PLUGIN_NAME).optional(null) }).map(new ConditionalParseMap()); parsers.put("Rule", new GrammarRule("ConditionalRule", diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java index 192b4924..5787ce3b 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/forallrule/ForallRulePlugin.java @@ -125,13 +125,13 @@ public Map getParsers() { termParser)), pTools.seq( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getKeywParser("do", PLUGIN_NAME), ruleParser, pTools.seq( pTools.getKeywParser("ifnone", PLUGIN_NAME), - ruleParser).optional(), - pTools.getKeywParser("endforall", PLUGIN_NAME).optional() + ruleParser).optional(null), + pTools.getKeywParser("endforall", PLUGIN_NAME).optional(null) }).map( new ForallParseMap()); parsers.put("Rule", diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java index 24b34c73..834ebe31 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/foreachrule/ForeachRulePlugin.java @@ -109,13 +109,13 @@ public Map getParsers() { termParser)), pTools.seq( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getKeywParser("do", PLUGIN_NAME), ruleParser, pTools.seq( pTools.getKeywParser("ifnone", PLUGIN_NAME), - ruleParser).optional(), - pTools.getKeywParser("endforeach", PLUGIN_NAME).optional() + ruleParser).optional(null), + pTools.getKeywParser("endforeach", PLUGIN_NAME).optional(null) }).map( new ForeachParseMap()); parsers.put("Rule", diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java index 16176abe..2ac0ea3e 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/io/IOPlugin.java @@ -229,7 +229,7 @@ public Map getParsers() { npTools.getOprParser(OPERATOR_LINUX_TO), npTools.getKeywParser(KEYWORD_INTO, PLUGIN_NAME), npTools.getOprParser(OPERATOR_LINUX_INTO)), - termParser).optional() + termParser).optional(null) }).map(vals -> { if (vals[2] == null) { Node node = new PrintRuleNode(((Node) vals[0]).getScannerInfo()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java index a4eb3d7f..0f9b4eee 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/list/ListPlugin.java @@ -204,7 +204,7 @@ public Map getParsers() { termParser)), Parsers.array( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getOprParser("]") }).map(new ListComprehensionParseMap()); parsers.put("ListComprehension", @@ -215,7 +215,7 @@ public Map getParsers() { // [ Term, ..., Term ] Parser listTermParser1 = Parsers.array( pTools.getOprParser(LIST_OPEN_SYMBOL_1), - csTerms.optional(), + csTerms.optional(null), pTools.getOprParser(LIST_CLOSE_SYMBOL_1)); // << Term, ..., Term >> diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java index 190ff4d9..36a0a1c4 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/map/MapPlugin.java @@ -225,7 +225,7 @@ public Node apply(Object[] vals) { termParser)), Parsers.array( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getOprParser("}") }).map(new MapComprehensionParseMap()); parsers.put("MapComprehension", diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java index 011838b2..46903e0d 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/number/NumberPlugin.java @@ -301,7 +301,7 @@ public Map getParsers() { termParser, pTools.seq( Parsers.or(pTools.getOprParser(":"), pTools.getKeywParser("step", PLUGIN_NAME)), - termParser).optional(), + termParser).optional(null), pTools.getOprParser("]") }).map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java index 27d819f0..33ff5865 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/options/OptionsPlugin.java @@ -191,7 +191,7 @@ public Node fromToken(Tok tok) { new Parser[] { pTools.getKeywParser("option", PLUGIN_NAME), optionNameParser, - pTools.seq(termParser.optional()).optional(), + pTools.seq(termParser.optional(null)).optional(null), }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java index ec777b79..55857690 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/plotter/PlotterPlugin.java @@ -145,7 +145,7 @@ public Map getParsers() { termParser, pTools.seq( pTools.getKeywParser("in", PLUGIN_NAME), - termParser).optional() + termParser).optional(null) }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java index fa82aef5..d266d476 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/property/PropertyPlugin.java @@ -88,7 +88,7 @@ public Map getParsers() { // 'property' Term Parser propertyExpr = pTools.seq( - pTools.getKeywParser("check", PLUGIN_NAME).atomic().optional(), + pTools.getKeywParser("check", PLUGIN_NAME).atomic().optional(null), pTools.getKeywParser("property", PLUGIN_NAME), termParser ); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java index b415ce75..3b597f13 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java @@ -470,7 +470,7 @@ public Map getParsers() { Parser setEnumerateParser = Parsers.array( new Parser[] { pTools.getOprParser("{"), - pTools.csplus(termParser).optional(), + pTools.csplus(termParser).optional(null), pTools.getOprParser("}") }).map( new SetEnumerateParseMap()); @@ -491,7 +491,7 @@ public Map getParsers() { termParser)), Parsers.array( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getOprParser("}") }), Parsers.array(new Parser[] { @@ -507,7 +507,7 @@ public Map getParsers() { termParser)), Parsers.array( pTools.getKeywParser("with", PLUGIN_NAME), - guardParser).optional(), + guardParser).optional(null), pTools.getOprParser("}") }) ).map(new SetComprehensionParseMap()); diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java index 3ad291f2..f4d8d381 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java @@ -230,7 +230,7 @@ public Node apply(Object[] vals) { pTools.getOprParser("="), pTools.getOprParser("{"), pTools.csplus(idParser), - pTools.getOprParser("}")).optional(), + pTools.getOprParser("}")).optional(null), }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { @@ -302,10 +302,10 @@ public Node apply(Node v) { Parser funcSigParser = Parsers.array( new Parser[] { pTools.getKeywParser("function", PLUGIN_NAME), - funcClassParser.optional(), + funcClassParser.optional(null), idParser, pTools.getOprParser(":"), - univTupleParser.optional(), + univTupleParser.optional(null), pTools.getOprParser("->"), univTermParser, Parsers.or( @@ -316,7 +316,7 @@ public Node apply(Node v) { pTools.getKeywParser("initialized", PLUGIN_NAME), pTools.getKeywParser("by", PLUGIN_NAME), termParser).atomic() - ).optional() + ).optional(null) }).map(new ParserTools.ArrayParseMap(PLUGIN_NAME) { @Override @@ -332,7 +332,7 @@ public Node apply(Object[] vals) { Parser derivedFuncParser = Parsers.array( new Parser[] { pTools.seq( - pTools.getKeywParser("function", PLUGIN_NAME)).optional(), + pTools.getKeywParser("function", PLUGIN_NAME)).optional(null), pTools.getKeywParser("derived", PLUGIN_NAME), ruleSignatureParser, pTools.getOprParser("="), diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java index 0d376746..b6cf3474 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/step/StepPlugin.java @@ -127,7 +127,7 @@ public Map getParsers() { new Parser[] { pTools.getKeywParser("step", PLUGIN_NAME), ruleParser, - pTools.getKeywParser("then", PLUGIN_NAME).optional(), + pTools.getKeywParser("then", PLUGIN_NAME).optional(null), ruleParser }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java index 013eeeb3..ba6b54e4 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/tree/TreePlugin.java @@ -246,7 +246,7 @@ public Node apply(Object[] vals) { pTools.seq( pTools.getKeywParser(AT_STR, PLUGIN_NAME), termParser - ).optional() + ).optional(null) }).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java index d9d07de2..503bd1d1 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/turboasm/TurboASMPlugin.java @@ -172,7 +172,7 @@ public Map getParsers() { ruleParser ) ), - pTools.getKeywParser("endseq", PLUGIN_NAME).optional() + pTools.getKeywParser("endseq", PLUGIN_NAME).optional(null) ), Parsers.array( pTools.getKeywParser("seq", PLUGIN_NAME), @@ -217,7 +217,7 @@ public Node apply(Object[] vals) { new Parser[] { pTools.getKeywParser("while", PLUGIN_NAME), termParser, //a term already allows surrounding brackets - pTools.getKeywParser("do", PLUGIN_NAME).optional(), + pTools.getKeywParser("do", PLUGIN_NAME).optional(null), ruleParser }).map( new WhileParseMap()); @@ -264,10 +264,10 @@ public Node apply(Object[] vals) { new Parser[] { pTools.getKeywParser("local", PLUGIN_NAME), Parsers.array( pTools.getOprParser(LOCAL_INIT_OPERATOR), - termParser).optional(), + termParser).optional(null), pTools.csplus( Parsers.array( idParser, Parsers.array( pTools.getOprParser(LOCAL_INIT_OPERATOR), - termParser).optional())), + termParser).optional(null))), pTools.getKeywParser("in", PLUGIN_NAME), ruleParser }).map( diff --git a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java index e916a1d5..f41d7467 100755 --- a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java @@ -355,7 +355,7 @@ public Map getParsers() { pTools.getKeywParser("import", PLUGIN_NAME), pTools.getKeywParser("native", PLUGIN_NAME), javaIdParser, - tupleTermParser.optional(), + tupleTermParser.optional(null), pTools.getKeywParser("into", PLUGIN_NAME), termParser }).map( @@ -391,7 +391,7 @@ public Map getParsers() { pTools.getKeywParser("result", PLUGIN_NAME), pTools.getKeywParser("into", PLUGIN_NAME), termParser - ).optional() + ).optional(null) }).map( new InvokeParseMap()); diff --git a/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java b/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java index 72464319..8487f2d8 100755 --- a/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/network/plugins/graph/GraphPlugin.java @@ -317,7 +317,7 @@ public Node apply(Object[] nodes) { Parser showGraphParser = Parsers.array( new Parser[] { pTools.getKeywParser(SHOW_GRAPH_KW_NAME, PLUGIN_NAME), - pTools.getKeywParser("at", PLUGIN_NAME).optional(), + pTools.getKeywParser("at", PLUGIN_NAME).optional(null), termParser}).map( new ParserTools.ArrayParseMap(PLUGIN_NAME) { diff --git a/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java b/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java index 136a43ca..6bd35fcd 100755 --- a/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/network/plugins/signals/SignalsPlugin.java @@ -161,7 +161,7 @@ public Map getParsers() { pTools.getKeywParser("as", PLUGIN_NAME), idParser, pTools.getKeywParser("do", PLUGIN_NAME), - ruleParser).optional(), + ruleParser).optional(null), }).map( new SignalRuleParseMap()); From 4754f7738d599008a29ba7bfa4a8e97883b0ddd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Tue, 5 Feb 2019 18:12:40 +0100 Subject: [PATCH 08/13] codestyle: remove unused assignments, move declaration to usage --- .../org/coreasm/engine/kernel/ExpressionParserFactory.java | 3 +-- .../src/org/coreasm/engine/parser/ParserTools.java | 5 ++--- .../src/org/coreasm/engine/plugins/bag/BagPlugin.java | 3 +-- .../engine/plugins/modularity/CoreModuleParseMap.java | 2 +- .../src/org/coreasm/engine/plugins/set/SetPlugin.java | 3 +-- .../coreasm/engine/plugins/signature/SignaturePlugin.java | 2 +- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java index 1850e200..1ed47e1f 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/ExpressionParserFactory.java @@ -464,8 +464,7 @@ public IndexMap(String opr1, String opr2, String pluginNames, OpType type, Objec */ @Override public Node apply(Node child) { - Node node = null; - node = new ASTNode( + Node node = new ASTNode( null, ASTNode.INDEX_OPERATOR_CLASS, "", opr1 + OperatorRule.OPERATOR_DELIMITER + opr2, child.getScannerInfo()); node.addChild(child); for (Object obj: cnodes) diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index b4c5c3b9..7cd3f441 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -218,8 +218,7 @@ public RuleDeclarationParseMap() { @Override public Node apply(Object[] vals) { - ScannerInfo info = null; - info = ((Node)vals[0]).getScannerInfo(); + ScannerInfo info = ((Node)vals[0]).getScannerInfo(); Node node = new ASTNode( null, @@ -259,7 +258,7 @@ public CoreASMParseMap() { @Override public Node apply(Object[] vals) { - ScannerInfo info = null; + ScannerInfo info; // consider the possiblity of starting with a // comment or whitespace diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java index cc69c445..fc0d1e1e 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/bag/BagPlugin.java @@ -1105,7 +1105,6 @@ public BagComprehensionParseMap() { @Override public Node apply(Object[] vals) { - Node node = null; // if there is an 'is' clause if (vals[1] != null && vals[1] instanceof Object[]) { Object[] newVals = new Object[vals.length - 1]; @@ -1114,7 +1113,7 @@ public Node apply(Object[] vals) { newVals[i] = vals[i + 1]; vals = newVals; } - node = new BagCompNode(((Node)vals[0]).getScannerInfo()); + Node node = new BagCompNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; } diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java index 1842b7d1..7b966877 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/modularity/CoreModuleParseMap.java @@ -32,7 +32,7 @@ public CoreModuleParseMap() { @Override public Node apply(Object[] vals) { - ScannerInfo info = null; + ScannerInfo info; // consider the possibility of starting with a // comment or whitespace diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java index 3b597f13..852097a7 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/set/SetPlugin.java @@ -1161,7 +1161,6 @@ public SetComprehensionParseMap() { @Override public Node apply(Object[] vals) { - Node node = null; // if there is an 'is' clause if (vals[1] != null && vals[1] instanceof Object[]) { Object[] newVals = new Object[vals.length - 1]; @@ -1170,7 +1169,7 @@ public Node apply(Object[] vals) { newVals[i] = vals[i + 1]; vals = newVals; } - node = new SetCompNode(((Node)vals[0]).getScannerInfo()); + Node node = new SetCompNode(((Node)vals[0]).getScannerInfo()); addChildren(node, vals); return node; } diff --git a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java index f4d8d381..4ae322cf 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/engine/plugins/signature/SignaturePlugin.java @@ -342,7 +342,7 @@ public Node apply(Object[] vals) { @Override public Node apply(Object[] vals) { - ScannerInfo info = null; + ScannerInfo info; if (vals[0] != null) info = ((Node)((Object[])vals[0])[0]).getScannerInfo(); else From 410c863d3520b34108fbad86884163405b1d473e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Wed, 6 Feb 2019 09:09:50 +0100 Subject: [PATCH 09/13] remove extends Object to avoid heap pollution - also remove old unused code --- .../coreasm/engine/parser/ParserTools.java | 111 ++++-------------- 1 file changed, 20 insertions(+), 91 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index 7cd3f441..c13e81a9 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -56,7 +56,7 @@ private ParserTools() { initialized = false; } - public void init(String [] keywords, String[] ops, Set> lexers) + public void init(String [] keywords, String[] ops, Set> lexers) { if (initialized == true) throw new EngineError("Cannot re-initialize ParserTools."); @@ -70,7 +70,7 @@ public void init(String [] keywords, String[] ops, Set> // Convert set with lexers into a list, because the keyword tokenizer must be first // and the identifier tokenizer must be last. - List> _lexers = new LinkedList>(lexers); + List> _lexers = new LinkedList<>(lexers); _lexers.add(0, tokenizer_keyw); _lexers.add(tokenizer_id); tokenizer = Parsers.or(_lexers); @@ -362,22 +362,8 @@ public Parser seq(Parser...parsers) { * @param name name of the new parser * @param parsers parsers to be sequenced */ - public Parser seq(String name, Parser...parsers) { - Parser seqParser = Parsers.array(parsers); - /*.new ParseMapN("") { - - public Object[] map(Object... vals) { - Object[] nodes = new Object[vals.length]; - - for (int i=0; i < vals.length; i++) - nodes[i] = vals[i]; - - return nodes; - } - - });*/ - - return seqParser; + public Parser seq(String name, Parser...parsers) { + return Parsers.array(parsers); } /** @@ -387,7 +373,7 @@ public Object[] map(Object... vals) { * * @param parser parser to be repeated */ - public Parser many(Parser parser) { + public Parser many(Parser parser) { return many("parser", parser); } @@ -399,10 +385,8 @@ public Parser many(Parser parser) { * @param name name of the new parser * @param parser parser to be repeated */ - public Parser many(String name, Parser parser) { - //Parser result = Parsers.many(name, Object.class, parser); - Parser result = parser.many().map(from -> from.toArray()); - return result; + public Parser many(String name, Parser parser) { + return parser.many().map(List::toArray); } /** @@ -412,7 +396,7 @@ public Parser many(String name, Parser parser) { * * @param parser parser to be repeated */ - public Parser star(Parser parser) { + public Parser star(Parser parser) { return star("parser", parser); } @@ -424,22 +408,8 @@ public Parser star(Parser parser) { * @param name name of the new parser * @param parser parser to be repeated */ - public Parser star(String name, Parser parser) { -// Parser result = seq(name, parser, getOptionalDelimiterParser()).many(Object[].class).map( -// new Map() { -// -// public Object[] map(Object[][] v) { -// ArrayList list = new ArrayList(); -// for (Object[] arr: v) -// for (Object obj: arr) -// list.add(obj); -// return list.toArray(); -// } -// } -// ); - Parser result = this.many(name, parser); - - return result; + public Parser star(String name, Parser parser) { + return this.many(name, parser); } /** @@ -449,7 +419,7 @@ public Parser star(String name, Parser parser) { * * @param parser parser to be repeated at least once */ - public Parser plus(Parser parser) { + public Parser plus(Parser parser) { return plus("parser", parser); } @@ -461,46 +431,8 @@ public Parser plus(Parser parser) { * @param name name of the new parser * @param parser parser to be repeated at least once */ - //public Parser plus(String name, Parser parser) { - // return plus(name, parser, getOptionalDelimiterParser()); - //} - - /** - * Returns a parser P that is: - *

- * P: ( parser delimiter )+ - * - * @param parser parser to be repeated at least once - * @param delimiter the delimiter parser - */ - //public Parser plus(Parser parser, Parser delimiter) { - // return plus("parser", parser, delimiter); - //} - - /** - * Returns a parser P that is: - *

- * P: ( parser delimiter )+ - * - * @param name name of the new parser - * @param parser parser to be repeated at least once - */ - public Parser plus(String name, Parser parser) { - /*Parser result = seq(name, parser, delimiter).many1(Object[].class).map( - new Map() { - - public Object[] map(Object[][] v) { - ArrayList list = new ArrayList(); - for (Object[] arr: v) - for (Object obj: arr) - list.add(obj); - return list.toArray(); - } - } - );*/ - Parser result = parser.many1().map(from -> from.toArray()); - - return result; + public Parser plus(String name, Parser parser) { + return parser.many1().map(List::toArray); } /** @@ -510,7 +442,7 @@ public Object[] map(Object[][] v) { * * @param parser parser to be repeated at least once */ - public Parser csplus(Parser parser) { + public Parser csplus(Parser parser) { return csplus("parser", parser); } @@ -522,7 +454,7 @@ public Parser csplus(Parser parser) { * @param commaParser the parser that parses the comma or any other symbol * @param parser parser to be repeated at least once */ - public Parser csplus(Parser commaParser, Parser parser) { + public Parser csplus(Parser commaParser, Parser parser) { return csplus("parser", commaParser, parser); } @@ -534,7 +466,7 @@ public Parser csplus(Parser commaParser, Parser csplus(String name, Parser parser) { + public Parser csplus(String name, Parser parser) { return csplus(name, getOprParser(","), parser); } @@ -547,8 +479,7 @@ public Parser csplus(String name, Parser parser) { * @param commaParser the parser that parses the comma or any other symbol * @param parser parser to be repeated at least once */ - @SuppressWarnings("unchecked") - public Parser csplus(String name, Parser commaParser, Parser parser) { + public Parser csplus(String name, Parser commaParser, Parser parser) { Parser repeated = star( seq( @@ -558,14 +489,12 @@ public Parser csplus(String name, Parser commaParser //getOptionalDelimiterParser() ) ); - - Parser result = seq(name, - parser, + + return seq(name, + parser, //getOptionalDelimiterParser(), repeated ); - - return result; } From 4d947f7a6325fa344241c23bee5f51e08efbb4a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Wed, 6 Feb 2019 09:14:29 +0100 Subject: [PATCH 10/13] codestyle: for-loop --- .../src/org/coreasm/engine/parser/ParserTools.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index c13e81a9..f86aa70b 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -228,17 +228,18 @@ public Node apply(Object[] vals) { info ); - for (int i=0; i < vals.length; i++) { - Node child = (Node)vals[i]; - if (child != null) + for (Object val : vals) { + if (val != null) { + Node child = (Node) val; // to give proper names to ASTNode children: if (child instanceof ASTNode) { - if (((ASTNode)child).getGrammarClass().equals("RuleSignature")) + if (((ASTNode) child).getGrammarClass().equals("RuleSignature")) node.addChild("alpha", child); else node.addChild("beta", child); } else node.addChild(child); + } } return node; From b80fe8b30345dbe834f42dffc0fd86c692605dab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Wed, 6 Feb 2019 09:44:22 +0100 Subject: [PATCH 11/13] ParserTools: deprecate methods with unused name parameter --- .../coreasm/engine/parser/ParserTools.java | 72 +++++++++++-------- 1 file changed, 42 insertions(+), 30 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java index f86aa70b..a8533602 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserTools.java @@ -350,8 +350,8 @@ public Node apply(Token v) * * @param parsers parsers to be sequenced */ - public Parser seq(Parser...parsers) { - return seq("parser", parsers); + public Parser seq(Parser... parsers) { + return Parsers.array(parsers); } /** @@ -362,9 +362,11 @@ public Parser seq(Parser...parsers) { * * @param name name of the new parser * @param parsers parsers to be sequenced + * @deprecated use {@link #seq(Parser[])} instead */ - public Parser seq(String name, Parser...parsers) { - return Parsers.array(parsers); + @Deprecated + public Parser seq(String name, Parser... parsers) { + return seq(parsers); } /** @@ -375,7 +377,7 @@ public Parser seq(String name, Parser...parsers) { * @param parser parser to be repeated */ public Parser many(Parser parser) { - return many("parser", parser); + return parser.many().map(List::toArray); } /** @@ -385,9 +387,11 @@ public Parser many(Parser parser) { * * @param name name of the new parser * @param parser parser to be repeated + * @deprecated use {@link #many(Parser)} instead */ + @Deprecated public Parser many(String name, Parser parser) { - return parser.many().map(List::toArray); + return many(parser); } /** @@ -396,9 +400,11 @@ public Parser many(String name, Parser parser) { * P: ( parser delimiter )* * * @param parser parser to be repeated + * @deprecated use {@link #many(Parser)} instead */ + @Deprecated public Parser star(Parser parser) { - return star("parser", parser); + return this.many(parser); } /** @@ -408,9 +414,11 @@ public Parser star(Parser parser) { * * @param name name of the new parser * @param parser parser to be repeated + * @deprecated use {@link #many(Parser)} instead */ + @Deprecated public Parser star(String name, Parser parser) { - return this.many(name, parser); + return this.many(parser); } /** @@ -421,7 +429,7 @@ public Parser star(String name, Parser parser) { * @param parser parser to be repeated at least once */ public Parser plus(Parser parser) { - return plus("parser", parser); + return parser.many1().map(List::toArray); } /** @@ -431,9 +439,11 @@ public Parser plus(Parser parser) { * * @param name name of the new parser * @param parser parser to be repeated at least once + * @deprecated use {@link #plus(Parser)} instead */ + @Deprecated public Parser plus(String name, Parser parser) { - return parser.many1().map(List::toArray); + return plus(parser); } /** @@ -444,7 +454,7 @@ public Parser plus(String name, Parser parser) { * @param parser parser to be repeated at least once */ public Parser csplus(Parser parser) { - return csplus("parser", parser); + return csplus(getOprParser(","), parser); } /** @@ -456,7 +466,21 @@ public Parser csplus(Parser parser) { * @param parser parser to be repeated at least once */ public Parser csplus(Parser commaParser, Parser parser) { - return csplus("parser", commaParser, parser); + Parser repeated = + many( + seq( + commaParser, + //getOptionalDelimiterParser(), + parser + //getOptionalDelimiterParser() + ) + ); + + return seq( + parser, + //getOptionalDelimiterParser(), + repeated + ); } /** @@ -466,9 +490,11 @@ public Parser csplus(Parser commaParser, Parser parser) { * * @param name name of the new parser * @param parser parsers to be repeated at least once + * @deprecated use {@link #csplus(Parser)} instead */ + @Deprecated public Parser csplus(String name, Parser parser) { - return csplus(name, getOprParser(","), parser); + return csplus(parser); } /** @@ -479,25 +505,11 @@ public Parser csplus(String name, Parser parser) { * @param name name of the new parser * @param commaParser the parser that parses the comma or any other symbol * @param parser parser to be repeated at least once + * @deprecated use {@link #csplus(Parser, Parser)} instead */ + @Deprecated public Parser csplus(String name, Parser commaParser, Parser parser) { - Parser repeated = - star( - seq( - commaParser, - //getOptionalDelimiterParser(), - parser - //getOptionalDelimiterParser() - ) - ); - - return seq(name, - parser, - //getOptionalDelimiterParser(), - repeated - ); + return csplus(commaParser, parser); } - - } From d725ee5a58b832d711738c50f5708e04e7ac8bde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Wed, 6 Feb 2019 11:54:16 +0100 Subject: [PATCH 12/13] fix deprecated usage --- .../src/org/coreasm/engine/kernel/Kernel.java | 16 ++++++++-------- .../coreasm/jasmine/plugin/JasminePlugin.java | 12 ++++++------ 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java index a35d2240..0ebd7e98 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java +++ b/org.coreasm.engine/src/org/coreasm/engine/kernel/Kernel.java @@ -388,14 +388,14 @@ public Node apply(Node a, Node b) { Parser coreASMParser = Parsers.array(new Parser[] { parserTools.getKeywParser("CoreASM", this.getName()), idParser, - parserTools.star( - Parsers.or( - useClauseParser, - refHeaderParser.lazy(), - initializationParser, - ruleDeclarationParser - ) - ) + parserTools.many( + Parsers.or( + useClauseParser, + refHeaderParser.lazy(), + initializationParser, + ruleDeclarationParser + ) + ) }).map(new ParserTools.CoreASMParseMap()) .followedBy(Parsers.EOF); parsers.put("CoreASM", new GrammarRule("CoreASM", diff --git a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java index f41d7467..6512f207 100755 --- a/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java +++ b/org.coreasm.engine/src/org/coreasm/jasmine/plugin/JasminePlugin.java @@ -338,12 +338,12 @@ public Map getParsers() { // TODO uncomment this line and change the rest of the code accordingly when the used feature becomes available //Parser tupleTermParser = kernel.getBasicExprParser(); - Parser repeated = - pTools.star( - pTools.seq( - pTools.getOprParser("."), - idParser - ) + Parser repeated = + pTools.many( + pTools.seq( + pTools.getOprParser("."), + idParser + ) ); Parser javaIdParser = From 8bf444878ad19fab6a895e27ccf794b733c60fa7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20Wolski?= Date: Wed, 6 Feb 2019 11:42:29 +0100 Subject: [PATCH 13/13] update to jparsec 3.1 --- org.coreasm.engine/pom.xml | 2 +- .../src/org/coreasm/engine/parser/JParsecParser.java | 3 +-- .../src/org/coreasm/engine/parser/ParserException.java | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/org.coreasm.engine/pom.xml b/org.coreasm.engine/pom.xml index f535473d..78c08884 100644 --- a/org.coreasm.engine/pom.xml +++ b/org.coreasm.engine/pom.xml @@ -128,7 +128,7 @@ org.jparsec jparsec - 3.0 + 3.1 concurrent diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java b/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java index 8fa51efc..ab4bf22a 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/JParsecParser.java @@ -185,8 +185,7 @@ public void parseSpecification() throws ParserException { } logger.error(errorLogMsg); - throw new ParserException(msg, - new CharacterPosition(pe.getLocation().line, pe.getLocation().column)); + throw new ParserException(msg, new CharacterPosition(pe.getLine(), pe.getColumn())); } throw new ParserException(e); } diff --git a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java index 1e6318b1..6a29cdc2 100644 --- a/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java +++ b/org.coreasm.engine/src/org/coreasm/engine/parser/ParserException.java @@ -59,7 +59,7 @@ public ParserException(Throwable cause) { showEncountered(buf, err.getEncountered()); } this.msg = buf.toString(); - pos = new CharacterPosition(pcause.getLocation().line, pcause.getLocation().column); + pos = new CharacterPosition(pcause.getLine(), pcause.getColumn()); } else { initCause(cause); pos = CharacterPosition.NO_POSITION;