Skip to content

Commit 18785d1

Browse files
committed
Accessor/Mutator refactor complete. Needs testing
1 parent 82fbd4c commit 18785d1

File tree

14 files changed

+204
-280
lines changed

14 files changed

+204
-280
lines changed

Files/Soup Compiled.jar

-473 Bytes
Binary file not shown.

SoupLanguage/SoupNoodle.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<style>h1 { color: blue;}p { color: red;}div { display: flex; align-items: center; justify-content: center; flex-direction: column;}</style><title>Soup Unit Test</title><center><h1>Testing of Soup from Soup [22:59]</h1></center><div><p>Local Vars</p><ul><li>3.0</li><li>5.0</li><li>5.0</li></ul><p>Outputs</p><ul><li>4.0</li><li>0.0</li><li>4.0</li><li>1.0</li><li>4.0</li><li>0.30103</li><li>4.0</li><li>2.0</li><li>6.0</li><li>1.0</li><li>2.0</li><li>3.0</li><li>4.0</li><li>6.0</li><li>0.9092974</li><li>-0.41614684</li><li>-2.1850398</li><li>NaN</li><li>NaN</li><li>1.1071488</li><li>2.0</li><li>2.0</li><li>2.0</li><li>5.0</li></ul></div><div><p>Questions Asked</p><ul><li>this is input</li></ul></div>
1+
<style>h1 { color: blue;}p { color: red;}div { display: flex; align-items: center; justify-content: center; flex-direction: column;}</style><title>Soup Unit Test</title><center><h1>Testing of Soup from Soup [10:2]</h1></center><div><p>Local Vars</p><ul><li>3.0</li><li>5.0</li><li>5.0</li></ul><p>Outputs</p><ul><li>4.0</li><li>0.0</li><li>4.0</li><li>1.0</li><li>4.0</li><li>0.30103</li><li>4.0</li><li>2.0</li><li>6.0</li><li>1.0</li><li>2.0</li><li>3.0</li><li>4.0</li><li>6.0</li><li>0.9092974</li><li>-0.41614684</li><li>-2.1850398</li><li>NaN</li><li>NaN</li><li>1.1071488</li><li>2.0</li><li>2.0</li><li>2.0</li><li>1.0</li></ul></div><div><p>Questions Asked</p><ul><li>this is input</li></ul></div>

SoupLanguage/src/xyz/amtstl/soup/Parser.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
import xyz.amtstl.soup.logic.InterVar;
88

99
public class Parser {
10-
private static int inx;
10+
public static int inx;
1111

1212
/**
1313
* Parser that gets the numbers
@@ -70,7 +70,7 @@ else if(cache.charAt(e) != '}') {
7070
whole = whole.substring(2, whole.length());
7171

7272
InterVar.parseInternalVar(whole.split(","));
73-
return InterVar.getParsedNumbers();
73+
return InterVar.parsedNumbers;
7474
}
7575

7676
/**
@@ -102,7 +102,7 @@ else if(cache.charAt(e) != ')') {
102102
whole = whole.substring(2, whole.length());
103103

104104
InterVar.parseInternalVar(whole.split("!"));
105-
return InterVar.getParsedNumbers();
105+
return InterVar.parsedNumbers;
106106
}
107107

108108
/**
@@ -132,12 +132,4 @@ else if(cache.charAt(e) != '}') {
132132
whole = whole.substring(2, whole.length());
133133
return whole;
134134
}
135-
136-
public static int getIndex() {
137-
return inx;
138-
}
139-
140-
public void setIndex(int newIndex) {
141-
inx = newIndex;
142-
}
143135
}

0 commit comments

Comments
 (0)