Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

AST datastructure with Simple Parser for Text File Lines and JSON import/export #63

Merged
merged 94 commits into from
Mar 24, 2021
Merged

AST datastructure with Simple Parser for Text File Lines and JSON import/export #63

merged 94 commits into from
Mar 24, 2021

Conversation

tcerny
Copy link
Collaborator

@tcerny tcerny commented Mar 2, 2021

fixed #50
fixed #51
fixed #52
fixed #56
fixed #58

tcerny and others added 30 commits December 9, 2020 18:59
@tcerny
created library de.variantsync.core
0136287
@jeremiaheinle
refractor package name
ebd6b2e
@wurstbroteater
deleted openjdk10 because its not working
40b4110
@tcerny
minor changes after creating core library project
fd5ea93 
- changed execution environment to java 1.8
- moved the new module to the right place in pom
@tcerny
first draft of a Simple Parser for Text File Lines tthuem#52
2070412
@jeremiaheinle
implemented tthuem#51
7a95103
@wurstbroteater
added UUID as type
2f4ad8a
@wurstbroteater
AST: added add method WIP toString
b9edc59
@wurstbroteater
added toString
fba3b05
@wurstbroteater
Fixed and Optimised toString()
7cc7dce
@wurstbroteater
added forgotten space in toString()
63b21fc
@wurstbroteater
changed gitignore
421883f
@jeremiaheinle
edited tthuem#51
b3d8ebb
@wurstbroteater
removed wrong java version
a003240
@jeremiaheinle
del apptest, enum
8be0f6e
@wurstbroteater
changed add Method of AST and its usage. Updated POM
d5417dd
@wurstbroteater
MAVEN: set JAVA version to 11 for usage of Path
b132ef9
@wurstbroteater
changed toString according to pauls ideas tthuem#50
225174a
@jeremiaheinle
prettty json and test AST.toString()
9259bcc
@wurstbroteater
Merge branch 'issue-50' into issue-51
829e4db
@wurstbroteater
Merge remote-tracking branch 'origin/issue-51' into issue-51
a3a96b7 
# Conflicts:
#	de.variantsync.core/src/main/java/de/variantsync/core/LineGrammar.java
@wurstbroteater
merge dropped LineGrammar
355cec9
@wurstbroteater
JsonParserTest fixed
06dbe23
@jeremiaheinle
exclude fiels in AST from JsonParser
dd854f8
@jeremiaheinle
added seriazable
d80b38b
@tcerny
Testcase for parseDirectory
94425ed 
additionally adjustments in simple parser
@wurstbroteater
fixed bug causing that the first dir is displayed twice
15c2c40
@wurstbroteater
first try to make attributed LineGrammar Enum
bf259dc
@wurstbroteater
Styleguide
5d82215
@wurstbroteater
refactoring AST.java
1435db5
@wurstbroteater
refactored separator vars
09823af
@wurstbroteater
refactored AST test and toString test
769ed4f
@wurstbroteater
added comments and java docs for readability
6e466ce
@wurstbroteater
fixed toStringTest out and restructured size test
0ec7870
@wurstbroteater
naming
b79c895
@wurstbroteater
removed unused/dangerous AST methods
2e985a6
@wurstbroteater
added test for maxDepth of AST
1dc99c6
@wurstbroteater
Deactivated failing test due to new AST format
f420d69
@wurstbroteater
Code formatted and clean up
00d542b
@wurstbroteater
Changed name of AST attribut to plural form
3838c0b
@wurstbroteater
fixed test for initial size
c6807fe
@wurstbroteater
addressing reviewer suggestion
e8cdf23 
add new constructor with UUID is parameter
@wurstbroteater
addressing reviewer suggestion
70ebe21 
return true if adding was successfull
@wurstbroteater
changed getSubtrees and code restructure
d8524f2
@wurstbroteater
added tests
a46fca3
@wurstbroteater
Code format and clean up
9fabadd
@wurstbroteater
addressing reviewer suggestion
08ab049 
modify add methods to increasing accuracy of return value
@wurstbroteater
minor improvments on add methods, added tests, code format and cleanup
063ef68
@wurstbroteater
renamed Test so that maven will auto exec it
0669169
@wurstbroteater
refactored toString, added printTree, fixed tests for AST
94bb0ec
@wurstbroteater
Code format and cleanup
32bac5e
@pmbittner pmbittner self-requested a review March 23, 2021 08:29
pmbittner
pmbittner requested changes Mar 23, 2021
View reviewed changes
de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java Outdated Show resolved Hide resolved
de.tubs.variantsync.core/src/de/tubs/variantsync/core/managers/data/FeatureContext.java Outdated Show resolved Hide resolved
de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java Outdated Show resolved Hide resolved
de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java Outdated Show resolved Hide resolved
de.variantsync.core/src/main/java/de/variantsync/core/ast/AST.java Show resolved Hide resolved
de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java Show resolved Hide resolved
de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java Show resolved Hide resolved
de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java Show resolved Hide resolved
de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java Outdated Show resolved Hide resolved
de.variantsync.core/src/test/java/de/variantsync/core/ASTTest.java Outdated Show resolved Hide resolved
@pmbittner pmbittner merged commit fca14c2 into tthuem:seproj_ulm_2020 Mar 24, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jeremiaheinle jeremiaheinle jeremiaheinle left review comments

@h3ssto h3ssto h3ssto left review comments

@pmbittner pmbittner pmbittner approved these changes

Assignees

@pmbittner pmbittner

@h3ssto h3ssto

Labels
bug enhancement
Projects
None yet
Milestone
VariantSync Core Library
5 participants
@tcerny @pmbittner @wurstbroteater @h3ssto @jeremiaheinle