Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAN-10 Corrected many styling errors which required little refactoring.

Browse Source
This commit is contained in:
BrittanyBi
2019-03-04 21:23:45 -07:00
parent dbce550625
commit 6f5bbab5ac
3 changed files with 79 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/src/main/java/edu/msudenver/tsp/services/parser/Node.java
+11 -5
View File
@@ -9,15 +9,21 @@ public class Node
Node parent;
int depth;
public Node(final String s, final Node p)
public Node(final String statement, final Node parent)
{
statement = s + "\n";
this.statement = statement + "\n";
left = null;
right = null;
center = null;
parent = p;
if(p != null) depth = p.depth + 1;
else depth = 0;
this.parent = parent;
if(parent != null)
{
depth = parent.depth + 1;
}
else
{
depth = 0;
}
}
@Override
services/src/main/java/edu/msudenver/tsp/services/parser/ParserService.java
+19 -24
View File
@@ -15,7 +15,7 @@ class ParserService {
private final TheoremController theoremController;
private final NotationController notationController;
private final ProofController proofController;
Node root;
private Node root;
@Autowired
public ParserService(final DefinitionController definitionController, final TheoremController theoremController,
@@ -26,24 +26,24 @@ class ParserService {
this.proofController = proofController;
}
public void driveParsingProcess(final String userInput)
public boolean parseUserInput(final String userInput)
{
final Node tree;
final ArrayList<String> statements;
try {
final Node tree = parseRawInput(userInput);
final ArrayList<String> statements = retrieveStatements(tree);
tree = parseRawInput(userInput);
statements = retrieveStatements(tree);
retrieveDefinitions(statements);
return true;
} catch(final Exception e) {
return false;
}
}
public Node parseRawInput(String input)
{
// convert to the same case for easier processing
input = input.toLowerCase();
root = new Node(input, null);
// special case: nothing is submitted
if(input.equals(""))
{
return root;
@@ -56,7 +56,7 @@ class ParserService {
private void recurse(final Node current)
{
int iContain;
int wordBeginsHere;
if(current.statement.contains("let"))
{
@@ -64,15 +64,15 @@ class ParserService {
current);
if(current.statement.contains("if")){
iContain = current.statement.indexOf("if");
wordBeginsHere = current.statement.indexOf("if");
} else if(current.statement.contains("then")){
iContain = current.statement.indexOf("then");
wordBeginsHere = current.statement.indexOf("then");
} else {
iContain = current.statement.length();
wordBeginsHere = current.statement.length();
}
current.left.center = new Node(current.statement.substring(current.statement.indexOf("let")+3,
iContain),
current.left.center = new Node(current.statement.substring(current.statement.indexOf("let")+"let".length(),
wordBeginsHere),
current.left);
recurse(current.left.center);
}
@@ -82,10 +82,10 @@ class ParserService {
{
current.center = new Node("if",
current);
iContain = (current.statement.contains("then") ? current.statement.indexOf("then") : current.statement.length());
wordBeginsHere = (current.statement.contains("then") ? current.statement.indexOf("then") : current.statement.length());
current.center.center = new Node(current.statement.substring(current.statement.indexOf("if")+2,
iContain),
current.center.center = new Node(current.statement.substring(current.statement.indexOf("if")+"if".length(),
wordBeginsHere),
current.center);
recurse(current.center.center);
}
@@ -95,7 +95,7 @@ class ParserService {
{
current.right = new Node("then",
current);
current.right.center = new Node(current.statement.substring(current.statement.indexOf("then")+4),
current.right.center = new Node(current.statement.substring(current.statement.indexOf("then")+"then".length()),
current.right);
recurse(current.right.center);
}
@@ -127,9 +127,4 @@ class ParserService {
return statementList;
}
public void retrieveDefinitions(final ArrayList<String> list)
{
// stub
}
}