From 696c69d6c32226b57503586a5b0d3fdfa610e41c Mon Sep 17 00:00:00 2001 From: Benjamin Culkin Date: Thu, 16 Nov 2023 01:16:37 +0000 Subject: Basic parser + evaluator skeleton This fleshes out a basic parser w/ a calculator grammar and the skeleton for an evaluator --- winot/winot-core/.classpath | 7 +- winot/winot-core/.gitignore | 1 + .../.settings/org.eclipse.jdt.core.prefs | 8 +- winot/winot-core/pom.xml | 56 ++++--- .../java/com/ashardalon/winot/core/TokenType.java | 17 +++ .../java/com/ashardalon/winot/core/WinotApp.java | 37 +++-- .../com/ashardalon/winot/core/WinotMainMode.java | 85 ++++++++--- .../java/com/ashardalon/winot/core/WinotValue.java | 168 +++++++++++++++++++++ winot/winot-core/src/main/java/module-info.java | 2 +- winot/winot-core/tags | 42 ++++++ .../winot-core/target/classes/META-INF/MANIFEST.MF | 9 +- .../maven/com.ashardalon/winot-core/pom.properties | 8 +- .../maven/com.ashardalon/winot-core/pom.xml | 56 ++++--- .../com/ashardalon/winot/core/TokenType.class | Bin 1314 -> 1525 bytes .../com/ashardalon/winot/core/WinotApp.class | Bin 4543 -> 5426 bytes .../com/ashardalon/winot/core/WinotContext.class | Bin 313 -> 313 bytes .../com/ashardalon/winot/core/WinotMainMode.class | Bin 6740 -> 11585 bytes .../com/ashardalon/winot/core/package-info.class | Bin 131 -> 131 bytes winot/winot-core/target/classes/module-info.class | Bin 222 -> 222 bytes 19 files changed, 405 insertions(+), 91 deletions(-) create mode 100644 winot/winot-core/.gitignore create mode 100644 winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotValue.java create mode 100644 winot/winot-core/tags diff --git a/winot/winot-core/.classpath b/winot/winot-core/.classpath index b6a7afa..5d2fb8e 100644 --- a/winot/winot-core/.classpath +++ b/winot/winot-core/.classpath @@ -9,6 +9,7 @@ + @@ -22,17 +23,17 @@ + - - + - + diff --git a/winot/winot-core/.gitignore b/winot/winot-core/.gitignore new file mode 100644 index 0000000..b83d222 --- /dev/null +++ b/winot/winot-core/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/winot/winot-core/.settings/org.eclipse.jdt.core.prefs b/winot/winot-core/.settings/org.eclipse.jdt.core.prefs index d089a9b..29fe717 100644 --- a/winot/winot-core/.settings/org.eclipse.jdt.core.prefs +++ b/winot/winot-core/.settings/org.eclipse.jdt.core.prefs @@ -1,11 +1,11 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=17 -org.eclipse.jdt.core.compiler.compliance=17 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning -org.eclipse.jdt.core.compiler.release=enabled -org.eclipse.jdt.core.compiler.source=17 +org.eclipse.jdt.core.compiler.release=disabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/winot/winot-core/pom.xml b/winot/winot-core/pom.xml index 71ac2c5..245bea4 100644 --- a/winot/winot-core/pom.xml +++ b/winot/winot-core/pom.xml @@ -1,29 +1,43 @@ 4.0.0 - com.ashardalon - winot - 0.0.1-SNAPSHOT + com.ashardalon + winot + 0.0.1-SNAPSHOT winot-core Core for Winot language - Contains the core for using the Winot language - + + Contains the core for using the Winot language + + + src/main/java + + + maven-compiler-plugin + 3.5.1 + + 11 + 11 + + + + - - bjc - BJC-Utils2 - 2.0-SNAPSHOT - - - bjc - JPratt - 0.0.2-SNAPSHOT - - - io.github.bculkin2442 - esodata - 2.0-SNAPSHOT - + + bjc + BJC-Utils2 + 2.0-SNAPSHOT + + + bjc + JPratt + 0.0.2-SNAPSHOT + + + io.github.bculkin2442 + esodata + 2.0-SNAPSHOT + - \ No newline at end of file + diff --git a/winot/winot-core/src/main/java/com/ashardalon/winot/core/TokenType.java b/winot/winot-core/src/main/java/com/ashardalon/winot/core/TokenType.java index 5387328..1757be5 100644 --- a/winot/winot-core/src/main/java/com/ashardalon/winot/core/TokenType.java +++ b/winot/winot-core/src/main/java/com/ashardalon/winot/core/TokenType.java @@ -11,6 +11,10 @@ public enum TokenType { * Terminal token. Represents end-of-input */ TERMINAL, + /** + * Result of evaluation + */ + RESULT, /** * Raw token. Hasn't been fully processed yet */ @@ -20,6 +24,19 @@ public enum TokenType { * 'def' special-object initiator */ DEF, + /** + * + operator + */ + ADD, + /** + * - operator + */ + MINUS, + /** / operator */ + DIVIDE, + /** * operator */ + MULTIPLY, + // Represent literals of various types /** * Double-quoted string. diff --git a/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotApp.java b/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotApp.java index 019ce49..fdf0e59 100644 --- a/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotApp.java +++ b/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotApp.java @@ -2,14 +2,14 @@ package com.ashardalon.winot.core; import java.io.InputStreamReader; import java.io.OutputStreamWriter; +import java.util.HashMap; +import java.util.Map; import bjc.data.*; import bjc.pratt.*; -import bjc.pratt.commands.InitialCommand; import bjc.pratt.commands.impls.InitialCommands; -import bjc.pratt.tokens.*; +import bjc.pratt.commands.impls.NonInitialCommands; import bjc.utils.cli.StreamTerminal; -import bjc.utils.parserutils.*; import bjc.utils.parserutils.splitter.*; /** @@ -24,17 +24,30 @@ public class WinotApp { * @param args Currently unused CLI args */ public static void main(String[] args) { + Map operators = new HashMap<>(); + + operators.put("def", TokenType.DEF); + + operators.put("+", TokenType.ADD); + operators.put("*", TokenType.MULTIPLY); + operators.put("-", TokenType.MINUS); + operators.put("/", TokenType.DIVIDE); + ConfigurableTokenSplitter baseSplitter = new ConfigurableTokenSplitter(true); - baseSplitter.addMultiDelimiters(" "); + + //baseSplitter.addMultiDelimiters(" "); + + baseSplitter.addSimpleDelimiters("+", "-", "*", "/"); + baseSplitter.compile(); ExcludingTokenSplitter exclSplitter = new ExcludingTokenSplitter(baseSplitter); - FilteredTokenSplitter filtSplitter = new FilteredTokenSplitter(exclSplitter, (tok) -> !tok.equals("")); + FilteredTokenSplitter filtSplitter = new FilteredTokenSplitter(exclSplitter, (tok) -> !tok.equals("") || !tok.equals(" ")); WinotContext state = new WinotContext(); - PrattParser parser = new PrattParser<>(); + PrattParser parser = new PrattParser<>(); parser.addInitialCommand(TokenType.LITERAL, InitialCommands.leaf()); parser.addInitialCommand(TokenType.DQ_STR, InitialCommands.leaf()); @@ -42,14 +55,20 @@ public class WinotApp { // using 'var' because otherwise the type is some 40+ characters involving repeating the command type twice // Also, have to specify args to 'branch' since the compiler can't guess them otherwise - var defBuilder = InitialCommands.branch(); - InitialCommand defCommand = defBuilder.add(TokenType.DEF, null).build(); + var defBuilder = InitialCommands.branch(); + var defCommand = defBuilder.add(TokenType.DEF, null).build(); parser.addInitialCommand(TokenType.DEF, defCommand); + + parser.addNonInitialCommand(TokenType.ADD, NonInitialCommands.infixLeft(10)); + parser.addNonInitialCommand(TokenType.MINUS, NonInitialCommands.infixLeft(10)); + parser.addNonInitialCommand(TokenType.MULTIPLY, NonInitialCommands.infixLeft(11)); + parser.addNonInitialCommand(TokenType.DIVIDE, NonInitialCommands.infixLeft(11)); StreamTerminal terminal = new StreamTerminal(new InputStreamReader(System.in), new OutputStreamWriter(System.out), "/", null); IntHolder comNo = new IntHolder(); - terminal.setMode(new WinotMainMode(terminal, comNo, parser, state, filtSplitter)); + WinotMainMode mode = new WinotMainMode(terminal, comNo, parser, state, filtSplitter, operators); + terminal.setMode(mode); terminal.addOutput("0 > "); terminal.run(); diff --git a/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotMainMode.java b/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotMainMode.java index ce8b9ef..1b520df 100644 --- a/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotMainMode.java +++ b/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotMainMode.java @@ -2,12 +2,15 @@ package com.ashardalon.winot.core; import java.util.Iterator; import java.util.List; +import java.util.Map; import java.util.function.Consumer; import java.util.function.Function; import bjc.data.*; +import bjc.funcdata.ListEx; import bjc.pratt.PrattParser; import bjc.pratt.commands.CommandResult; +import bjc.pratt.commands.CommandResult.Status; import bjc.pratt.tokens.*; import bjc.utils.cli.StreamTerminal; import bjc.utils.parserutils.ParserException; @@ -17,19 +20,21 @@ import bjc.utils.parserutils.splitter.FilteredTokenSplitter; final class WinotMainMode implements Consumer { private final StreamTerminal terminal; private final IntHolder comNo; - private final PrattParser parser; + private final PrattParser parser; private final WinotContext state; private final FilteredTokenSplitter filtSplitter; + private final Map operators; - WinotMainMode(StreamTerminal terminal, IntHolder comNo, PrattParser parser, - WinotContext state, FilteredTokenSplitter filtSplitter) { + WinotMainMode(StreamTerminal terminal, IntHolder comNo, PrattParser parser, + WinotContext state, FilteredTokenSplitter filtSplitter, Map operators) { this.terminal = terminal; this.comNo = comNo; this.parser = parser; this.state = state; this.filtSplitter = filtSplitter; + this.operators = operators; } - + @Override public void accept(String str) { List rawTokens = TokenUtils.removeDQuotedStrings(str); @@ -37,31 +42,65 @@ final class WinotMainMode implements Consumer { Function> tokenzer = (strang) -> { return new SimpleToken<>(strToggle.get(), strang); }; - TransformIterator> rawItr = new TransformIterator<>(rawTokens.iterator(), tokenzer); - FlatMapIterator, - Token> mapItr = new FlatMapIterator<>(rawItr, (tok) -> { - if (tok.getKey() == TokenType.RAW) { - Iterator tknItr = filtSplitter.split(tok.getValue()).toIterable().iterator(); - Function> literizer = (tokn) -> { - return new SimpleToken<>(TokenType.LITERAL, tokn); - }; - TransformIterator> transf = new TransformIterator<>(tknItr, literizer); - return transf; - } - return new SingleIterator<>(tok); - }); - SimpleTokenStream sts = new SimpleTokenStream<>(mapItr, new SimpleToken<>(TokenType.TERMINAL, "")); + var rawItr = new TransformIterator>(rawTokens.iterator(), tokenzer); + var mapItr = new FlatMapIterator, Token>(rawItr, this::toLiteral); + var sts = new SimpleTokenStream(mapItr, new SimpleToken<>(TokenType.TERMINAL, WinotValue.EMPTY)); try { // Prime token stream sts.next(); - CommandResult result = parser.parseExpression(0, sts, state, true); - terminal.addOutput(result.toString() + "\n"); + CommandResult result = parser.parseExpression(0, sts, state, true); + terminal.addOutput("Parsed:\n" + result.toString() + "\n"); + if (result.status == Status.SUCCESS) { + var evalRes = result.success().topDownTransform((tok) -> { + // Default to evaluating bottom up + return TopDownTransformResult.PUSHDOWN; + }, (tree) -> { + Token head = tree.getHead(); + switch (head.getKey()) { + case LITERAL: + SimpleToken res = new SimpleToken<>(TokenType.RESULT, head.getValue()); + return new SimpleTree<>(res); + default: + throw new UnsupportedOperationException("Unsupport eval token: " + head.getKey()); + } + }); + terminal.addOutput("Evaluated to: " + evalRes); + } + if (sts.hasNext()) { + terminal.addOutput("Remaining tokens:\n"); + sts.forEachRemaining((tok) -> { + terminal.addOutput("\t" + tok.toString() + "\n"); + }); + } } catch (ParserException pex) { terminal.addOutput(pex.toString() + "\n"); } terminal.addOutput(String.format("%d > ", comNo.incr())); } + + private Iterator> toLiteral(Token tok) { + if (tok.getKey() == TokenType.RAW) { + ListEx splist = filtSplitter.split(tok.getValue()); + Iterator tknItr = splist.toIterable().iterator(); + TransformIterator splitr; + splitr = new TransformIterator(tknItr, String::trim); + + Function> literizer; + literizer = (tokn) -> { + if (operators.containsKey(tokn)) { + return new SimpleToken<>(operators.get(tokn), WinotValue.EMPTY); + } else if (tokn.matches("\\d+")) { + WinotValue intVal = WinotValue.integer(Integer.parseInt(tokn)); + return new SimpleToken<>(TokenType.LITERAL, intVal); + } else if (TokenUtils.isDouble(tokn)) { + WinotValue doubleVal = WinotValue.fpLit(Double.parseDouble(tokn)); + return new SimpleToken<>(TokenType.LITERAL, doubleVal); + } + return new SimpleToken<>(TokenType.LITERAL, WinotValue.string(tokn)); + }; + var transf = new TransformIterator>(splitr, literizer); + return transf; + } + return new SingleIterator<>(new SimpleToken<>(tok.getKey(), WinotValue.string(tok.getValue()))); + } } \ No newline at end of file diff --git a/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotValue.java b/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotValue.java new file mode 100644 index 0000000..79b57e9 --- /dev/null +++ b/winot/winot-core/src/main/java/com/ashardalon/winot/core/WinotValue.java @@ -0,0 +1,168 @@ +package com.ashardalon.winot.core; + +import java.util.Objects; + +public class WinotValue { + public enum Type { + /** + * A value that contains nothing + */ + EMPTY, + /** + * A string + */ + STRING, + /** + * An int + */ + INT, + /** + * A double + */ + DOUBLE + } + + public static final class IntegerWinotValue extends WinotValue { + public int val; + + public IntegerWinotValue(int val) { + super(Type.INT); + this.val = val; + } + + @Override + public int hashCode() { + return Objects.hash(val); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + IntegerWinotValue other = (IntegerWinotValue) obj; + return val == other.val; + } + + @Override + public String toString() { + return "IntegerWinotValue [val=" + val + "]"; + } + } + + public static final class DoubleWinotValue extends WinotValue { + public double val; + + public DoubleWinotValue(double val) { + super(Type.DOUBLE); + this.val = val; + } + + @Override + public int hashCode() { + return Objects.hash(val); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + DoubleWinotValue other = (DoubleWinotValue) obj; + return Double.doubleToLongBits(val) == Double.doubleToLongBits(other.val); + } + + @Override + public String toString() { + return "DoubleWinotValue [val=" + val + "]"; + } + } + + public static class TerminalWinotValue extends WinotValue { + public TerminalWinotValue() { + super(Type.EMPTY); + } + + @Override + public String toString() { + return "TerminalWinotValue []"; + } + } + + public static class StringWinotValue extends WinotValue { + private String val; + + public StringWinotValue(String val) { + super(Type.STRING); + this.val = val; + } + + @Override + public int hashCode() { + return Objects.hash(val); + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + StringWinotValue other = (StringWinotValue) obj; + return Objects.equals(val, other.val); + } + + @Override + public String toString() { + return "StringWinotValue [val=" + val + "]"; + } + } + + public final Type type; + + protected WinotValue(Type typ) { + this.type = typ; + } + + public static WinotValue EMPTY = new TerminalWinotValue(); + + + public static WinotValue string(String val) { + return new StringWinotValue(val); + } + + + public static WinotValue integer(int val) { + return new IntegerWinotValue(val); + } + + public static WinotValue fpLit(double val) { + return new DoubleWinotValue(val); + } + + @Override + public int hashCode() { + return Objects.hash(type); + } + + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + WinotValue other = (WinotValue) obj; + return type == other.type; + } +} \ No newline at end of file diff --git a/winot/winot-core/src/main/java/module-info.java b/winot/winot-core/src/main/java/module-info.java index 96194a7..c0addf7 100644 --- a/winot/winot-core/src/main/java/module-info.java +++ b/winot/winot-core/src/main/java/module-info.java @@ -5,6 +5,6 @@ */ module com.ashardalon.winot.core { requires bjc.utils; - requires jpratt; requires esodata; + requires jpratt; } \ No newline at end of file diff --git a/winot/winot-core/tags b/winot/winot-core/tags new file mode 100644 index 0000000..3cdfe0e --- /dev/null +++ b/winot/winot-core/tags @@ -0,0 +1,42 @@ +!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ +!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ +!_TAG_PROGRAM_AUTHOR Darren Hiebert /dhiebert@users.sourceforge.net/ +!_TAG_PROGRAM_NAME Exuberant Ctags // +!_TAG_PROGRAM_URL http://ctags.sourceforge.net /official site/ +!_TAG_PROGRAM_VERSION 5.8 // +DEF src/main/java/com/ashardalon/winot/core/TokenType.java /^ DEF,$/;" e enum:TokenType file: +DQ_STR src/main/java/com/ashardalon/winot/core/TokenType.java /^ DQ_STR,$/;" e enum:TokenType file: +EMPTY src/main/java/com/ashardalon/winot/core/WinotValue.java /^ EMPTY,$/;" e enum:WinotValue.Type file: +EMPTY src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public static WinotValue EMPTY = new TerminalWinotValue();$/;" f class:WinotValue +LITERAL src/main/java/com/ashardalon/winot/core/TokenType.java /^ LITERAL$/;" e enum:TokenType file: +RAW src/main/java/com/ashardalon/winot/core/TokenType.java /^ RAW,$/;" e enum:TokenType file: +STRING src/main/java/com/ashardalon/winot/core/WinotValue.java /^ STRING$/;" e enum:WinotValue.Type file: +StringWinotValue src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public StringWinotValue(String val) {$/;" m class:WinotValue.StringWinotValue +StringWinotValue src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public static class StringWinotValue extends WinotValue {$/;" c class:WinotValue +TERMINAL src/main/java/com/ashardalon/winot/core/TokenType.java /^ TERMINAL,$/;" e enum:TokenType file: +TerminalWinotValue src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public TerminalWinotValue() {$/;" m class:WinotValue.TerminalWinotValue +TerminalWinotValue src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public static class TerminalWinotValue extends WinotValue {$/;" c class:WinotValue +TokenType src/main/java/com/ashardalon/winot/core/TokenType.java /^public enum TokenType {$/;" g +Type src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public enum Type {$/;" g class:WinotValue +WinotApp src/main/java/com/ashardalon/winot/core/WinotApp.java /^public class WinotApp {$/;" c +WinotContext src/main/java/com/ashardalon/winot/core/WinotContext.java /^public class WinotContext {$/;" c +WinotMainMode src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ WinotMainMode(StreamTerminal terminal, IntHolder comNo, PrattParser parser,$/;" m class:WinotMainMode +WinotMainMode src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^final class WinotMainMode implements Consumer {$/;" c +WinotValue src/main/java/com/ashardalon/winot/core/WinotValue.java /^public class WinotValue {$/;" c +accept src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ public void accept(String str) {$/;" m class:WinotMainMode +com.ashardalon.winot.core src/main/java/com/ashardalon/winot/core/TokenType.java /^package com.ashardalon.winot.core;$/;" p +com.ashardalon.winot.core src/main/java/com/ashardalon/winot/core/WinotApp.java /^package com.ashardalon.winot.core;$/;" p +com.ashardalon.winot.core src/main/java/com/ashardalon/winot/core/WinotContext.java /^package com.ashardalon.winot.core;$/;" p +com.ashardalon.winot.core src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^package com.ashardalon.winot.core;$/;" p +com.ashardalon.winot.core src/main/java/com/ashardalon/winot/core/WinotValue.java /^package com.ashardalon.winot.core;$/;" p +com.ashardalon.winot.core src/main/java/com/ashardalon/winot/core/package-info.java /^package com.ashardalon.winot.core;/;" p +comNo src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ private final IntHolder comNo;$/;" f class:WinotMainMode file: +equals src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public boolean equals(Object obj) {$/;" m class:WinotValue.StringWinotValue +filtSplitter src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ private final FilteredTokenSplitter filtSplitter;$/;" f class:WinotMainMode file: +hashCode src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public int hashCode() {$/;" m class:WinotValue.StringWinotValue +main src/main/java/com/ashardalon/winot/core/WinotApp.java /^ public static void main(String[] args) {$/;" m class:WinotApp +parser src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ private final PrattParser parser;$/;" f class:WinotMainMode file: +state src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ private final WinotContext state;$/;" f class:WinotMainMode file: +string src/main/java/com/ashardalon/winot/core/WinotValue.java /^ public static WinotValue string(String val) {$/;" m class:WinotValue +terminal src/main/java/com/ashardalon/winot/core/WinotMainMode.java /^ private final StreamTerminal terminal;$/;" f class:WinotMainMode file: +val src/main/java/com/ashardalon/winot/core/WinotValue.java /^ private String val;$/;" f class:WinotValue.StringWinotValue file: diff --git a/winot/winot-core/target/classes/META-INF/MANIFEST.MF b/winot/winot-core/target/classes/META-INF/MANIFEST.MF index 0276670..b087487 100644 --- a/winot/winot-core/target/classes/META-INF/MANIFEST.MF +++ b/winot/winot-core/target/classes/META-INF/MANIFEST.MF @@ -1,5 +1,4 @@ -Manifest-Version: 1.0 -Built-By: bjcul -Build-Jdk: 18.0.1 -Created-By: Maven Integration for Eclipse - +Manifest-Version: 1.0 +Build-Jdk-Spec: 17 +Created-By: Maven Integration for Eclipse + diff --git a/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.properties b/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.properties index 242b22b..3c453f4 100644 --- a/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.properties +++ b/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.properties @@ -1,7 +1,7 @@ #Generated by Maven Integration for Eclipse -#Wed Oct 25 19:34:06 EDT 2023 -artifactId=winot-core -groupId=com.ashardalon -m2e.projectLocation=C\:\\Users\\bjcul\\eclipse-workspace\\winot\\winot-core +#Wed Nov 15 23:55:36 GMT 2023 +m2e.projectLocation=/home/bjculkin/projects/winot/winot/winot-core m2e.projectName=winot-core +groupId=com.ashardalon +artifactId=winot-core version=0.0.1-SNAPSHOT diff --git a/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.xml b/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.xml index 71ac2c5..245bea4 100644 --- a/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.xml +++ b/winot/winot-core/target/classes/META-INF/maven/com.ashardalon/winot-core/pom.xml @@ -1,29 +1,43 @@ 4.0.0 - com.ashardalon - winot - 0.0.1-SNAPSHOT + com.ashardalon + winot + 0.0.1-SNAPSHOT winot-core Core for Winot language - Contains the core for using the Winot language - + + Contains the core for using the Winot language + + + src/main/java + + + maven-compiler-plugin + 3.5.1 + + 11 + 11 + + + + - - bjc - BJC-Utils2 - 2.0-SNAPSHOT - - - bjc - JPratt - 0.0.2-SNAPSHOT - - - io.github.bculkin2442 - esodata - 2.0-SNAPSHOT - + + bjc + BJC-Utils2 + 2.0-SNAPSHOT + + + bjc + JPratt + 0.0.2-SNAPSHOT + + + io.github.bculkin2442 + esodata + 2.0-SNAPSHOT + - \ No newline at end of file + diff --git a/winot/winot-core/target/classes/com/ashardalon/winot/core/TokenType.class b/winot/winot-core/target/classes/com/ashardalon/winot/core/TokenType.class index cd5d9e7..bfe59f6 100644 Binary files a/winot/winot-core/target/classes/com/ashardalon/winot/core/TokenType.class and b/winot/winot-core/target/classes/com/ashardalon/winot/core/TokenType.class differ diff --git a/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotApp.class b/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotApp.class index a2fc97d..1c64ce6 100644 Binary files a/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotApp.class and b/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotApp.class differ diff --git a/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotContext.class b/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotContext.class index 15ae22b..6dc99a6 100644 Binary files a/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotContext.class and b/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotContext.class differ diff --git a/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotMainMode.class b/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotMainMode.class index 90a0570..b479652 100644 Binary files a/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotMainMode.class and b/winot/winot-core/target/classes/com/ashardalon/winot/core/WinotMainMode.class differ diff --git a/winot/winot-core/target/classes/com/ashardalon/winot/core/package-info.class b/winot/winot-core/target/classes/com/ashardalon/winot/core/package-info.class index 54aba6e..2f38b09 100644 Binary files a/winot/winot-core/target/classes/com/ashardalon/winot/core/package-info.class and b/winot/winot-core/target/classes/com/ashardalon/winot/core/package-info.class differ diff --git a/winot/winot-core/target/classes/module-info.class b/winot/winot-core/target/classes/module-info.class index 254dd2c..a73931e 100644 Binary files a/winot/winot-core/target/classes/module-info.class and b/winot/winot-core/target/classes/module-info.class differ -- cgit v1.2.3