Skip to content

Commit 5e2e75d

Browse files
committed
0.10.3 - updated jcollection-util, jfile-io, jtext-util library dependencies to latest versions, added jcollection-interfaces dependency
1 parent 7195091 commit 5e2e75d

File tree

7 files changed

+29
-19
lines changed

7 files changed

+29
-19
lines changed

.classpath

+4-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,15 @@
66
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
77
<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
88
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/ANTLR"/>
9-
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestUtil"/>
109
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Lombok"/>
1110
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TemplateUtil"/>
11+
<classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/TestChecks"/>
1212
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/data-transfer/jar/data_transfer.jar"/>
1313
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-annotations-2.5.0.jar"/>
1414
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-core-2.5.0.jar"/>
1515
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jackson/jar/jackson-databind-2.5.4.jar"/>
1616
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jarray-util/jar/jarray_util.jar" sourcepath="/JArrayUtil"/>
17+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-interfaces/jar/jcollection_interfaces.jar" sourcepath="/JCollectionInterfaces"/>
1718
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jcollection-util/jar/jcollection_util.jar" sourcepath="/JCollectionUtil"/>
1819
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jdata-util/jar/jdata_util.jar" sourcepath="/JDataUtil"/>
1920
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfunc/jar/jfunc.jar" sourcepath="/JFunc"/>
@@ -24,8 +25,8 @@
2425
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jsimple-types/jar/jsimple_types.jar" sourcepath="/JSimpleTypes/src"/>
2526
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/json-io/jar/json_io.jar" sourcepath="/JsonIo"/>
2627
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jstreamish/jar/jstreamish.jar" sourcepath="/JStreamish"/>
27-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-parser/jar/jtext_parser.jar" sourcepath="/JTextParser/src"/>
28-
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/jar/jtext_util.jar" sourcepath="/JTextUtil"/>
28+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-parser/jar/jtext_parser.jar" sourcepath="/JTextParser"/>
29+
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtext-util/jar/jtext_util.jar" sourcepath="C:/Users/TeamworkGuy2/Documents/Java/Projects/JTextParser/src"/>
2930
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtree-walker/jar/jtree_walker.jar" sourcepath="/JTreeWalker"/>
3031
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jfile-io/jar/jfile_io.jar" sourcepath="/JFileIo"/>
3132
<classpathentry kind="lib" path="C:/Users/TeamworkGuy2/Documents/Java/Libraries/jtwg2-logging/jar/jtwg2_logging.jar" sourcepath="/JTwg2Logging"/>

CHANGELOG.md

+10-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,16 @@ This project does its best to adhere to [Semantic Versioning](http://semver.org/
44

55

66
--------
7-
###[0.10.2](N/A) - 2016-06-21
7+
###[0.10.3](N/A) - 2016-08-07
8+
####Changed
9+
* Updated jcollection-util to latest 0.5.x version
10+
* Updated jfile-io to latest 0.6.x version(SourceInfo renamed to DirectorySearchInfo)
11+
* Updated jtext-util to latest 0.10.x version (some classes moved to new twg2.text.stringSearch package)
12+
* Added jcollection-interfaces dependency
13+
14+
15+
--------
16+
###[0.10.2](https://github.com/TeamworkGuy2/JParserTools/commit/719509161f795fbafc56c8beefd51562103b6cb7) - 2016-06-21
817
####Added
918
* plugin-js to help generate CLI strings from TypeScript/Javascript projects, with Node.js in mind
1019
* Readme section about the CLI

README.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
ParserToolsTmp
22
==============
3-
version: 0.10.2
3+
version: 0.10.3
44

55
In progress C#/Java/TypeScript parser tools built atop [JTextParser] (https://github.com/TeamworkGuy2/JTextParser), [Jackson] (https://github.com/FasterXML/jackson-core/) (core, databind, annotations) and half a dozen other utility libraries.
66

77
####Goals:
88
* A competent source code parser that can turn C#, Java, or JavaScript/TypeScript code into a simple AST like structure ('competent' meaning this project aims to support common use cases, not every syntatic feature of the supported languages).
9-
* A 'code first' parser aimed at manipulating the resulting AST and writing it back as source code or JSON. With the goal of allowing simple language constructs like interfaces and data models to be transpiled to different languages.
9+
* A code first parser aimed at manipulating the resulting AST and writing it back as source code or JSON. With the goal of allowing simple language constructs like interfaces and data models to be transpiled to different languages.
1010

1111
####Not Goals:
1212
* NOT to create another compiler for C#, Java, or JS/TS. This project's parser expects valid code as input, the few error messages that are present are NOT design to highlight syntax errors in the input.
@@ -199,23 +199,23 @@ The following formats are valid:
199199
'path=depth'
200200
'path'
201201

202-
Example: '/project/myApp/Models=3,[java,json]'
203-
Note: the brackets around '[fileExt]' are literla.
202+
Example: ```/project/myApp/Models=3,[java,json]```
203+
Note: the brackets around '[fileExt]' are literal.
204204

205205

206206
###Destinations
207207
A semicolon separated list of output file names associated with lists of namespaces. Each parsed file who's namespace falls into one of these lists is written to that file.
208208
The following format is valid:
209209
'path=[namespace,namespace,...]'
210210

211-
Example: '/project/output/models.json=[MyApp.Models]'
211+
Example: ```/project/output/models.json=[MyApp.Models]```
212212

213213

214214
####Log
215215
An optional log file name to write parser information to, in the format:
216216
'path'
217217

218-
Example: '/project/output/parser-log.log'
218+
Example: ```/project/output/parser-log.log```
219219

220220

221221
--------

bin/jparser-tools.jar

11 KB
Binary file not shown.

package-lib.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version" : "0.10.2",
2+
"version" : "0.10.3",
33
"name" : "jparser-tools",
44
"description" : "An in-progress suite of parsing tools for C#, Java, and TypeScript source code",
55
"homepage" : "https://github.com/TeamworkGuy2/JFileIo",

src/twg2/parser/main/ParserWorkflow.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import lombok.val;
2323
import twg2.ast.interm.classes.ClassAst;
2424
import twg2.dataUtil.dataUtils.TimeUnitUtil;
25+
import twg2.io.fileLoading.DirectorySearchInfo;
2526
import twg2.io.fileLoading.SourceFiles;
26-
import twg2.io.fileLoading.SourceInfo;
2727
import twg2.io.files.FileFormatException;
2828
import twg2.io.files.FileReadUtil;
2929
import twg2.io.write.JsonWrite;
@@ -48,12 +48,12 @@
4848
public class ParserWorkflow {
4949
static String newline = System.lineSeparator();
5050

51-
List<SourceInfo> sources;
51+
List<DirectorySearchInfo> sources;
5252
List<DestinationInfo> destinations;
5353
Path logFile;
5454

5555

56-
public ParserWorkflow(List<SourceInfo> sources, List<DestinationInfo> destinations, Path log) {
56+
public ParserWorkflow(List<DirectorySearchInfo> sources, List<DestinationInfo> destinations, Path log) {
5757
this.sources = sources;
5858
this.destinations = destinations;
5959
this.logFile = log;
@@ -176,7 +176,7 @@ public void log(Logging log, Level level, boolean includeHeader) {
176176
}
177177

178178

179-
public static ParsedResult parse(List<Entry<SourceInfo, List<Path>>> files, ExecutorService executor, FileReadUtil fileReader) throws IOException, FileFormatException {
179+
public static ParsedResult parse(List<Entry<DirectorySearchInfo, List<Path>>> files, ExecutorService executor, FileReadUtil fileReader) throws IOException, FileFormatException {
180180
val fileSet = new ProjectClassSet.Simple<CodeFileSrc<CodeLanguage>, CompoundBlock>();
181181

182182
for(val filesWithSrc : files) {
@@ -383,7 +383,7 @@ public static ParserWorkflow parseArgs(String[] args) {
383383
argNames.put("destinations", "destinations - a semicolon separated list of strings in the format 'path=[namespace,namespace,...], ...'. Example: '/project/tmp_files/models.json=[MyApp.Models]'");
384384
argNames.put("log", "log - a log file path in the format 'path'. Example: '/project/tmp_files/parser-log.log'");
385385

386-
List<SourceInfo> srcs = new ArrayList<>();
386+
List<DirectorySearchInfo> srcs = new ArrayList<>();
387387
List<DestinationInfo> dsts = new ArrayList<>();
388388
Path log = null;
389389

@@ -406,7 +406,7 @@ public static ParserWorkflow parseArgs(String[] args) {
406406

407407
if("sources".equals(name)) {
408408
for(val valueStr : values) {
409-
val value = SourceInfo.parseFromArgs(valueStr, "sources");
409+
val value = DirectorySearchInfo.parseFromArgs(valueStr, "sources");
410410
srcs.add(value);
411411
}
412412
}

test/twg2/parser/test/MiscStringTests.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
import twg2.parser.textParser.TextParser;
1717
import twg2.parser.textParser.TextParserImpl;
1818
import twg2.parser.textParserUtils.EscapeSequences;
19-
import twg2.text.stringUtils.StringCompare;
20-
import twg2.text.stringUtils.StringIndex;
19+
import twg2.text.stringSearch.StringCompare;
20+
import twg2.text.stringSearch.StringIndex;
2121
import checks.CheckTask;
2222
import checks.TestData;
2323
import checks.TestDataObj;

0 commit comments

Comments
 (0)