Skip to content

Commit 4fd82e5

Browse files
jimourisjimouris
committed
Restructure directories
1 parent 7bc2fc6 commit 4fd82e5

31 files changed

+91
-90
lines changed

‎.gitignore

+12-12
Original file line numberDiff line numberDiff line change
@@ -26,19 +26,19 @@ hs_err_pid*
2626
*.html
2727

2828

29-
src/main/java/org/twc/zerojavacompiler/zerojavavisitor/*.java
30-
src/main/java/org/twc/zerojavacompiler/zerojavasyntaxtree/*.java
31-
src/main/java/org/twc/zerojavacompiler/zerojavaparser/*.java
29+
src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavavisitor/*.java
30+
src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavasyntaxtree/*.java
31+
src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavaparser/*.java
3232

33-
src/main/java/org/twc/zerojavacompiler/spigletvisitor/*.java
34-
src/main/java/org/twc/zerojavacompiler/spigletsyntaxtree/*.java
35-
src/main/java/org/twc/zerojavacompiler/spigletparser/*.java
33+
src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletvisitor/*.java
34+
src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletsyntaxtree/*.java
35+
src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletparser/*.java
3636

37-
src/main/java/org/twc/zerojavacompiler/kangavisitor/*.java
38-
src/main/java/org/twc/zerojavacompiler/kangasyntaxtree/*.java
39-
src/main/java/org/twc/zerojavacompiler/kangaparser/*.java
37+
src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangavisitor/*.java
38+
src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangasyntaxtree/*.java
39+
src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangaparser/*.java
4040

41-
src/main/java/org/twc/zerojavacompiler/zmipsvisitor/*.java
42-
src/main/java/org/twc/zerojavacompiler/zmipssyntaxtree/*.java
43-
src/main/java/org/twc/zerojavacompiler/zmipsparser/*.java
41+
src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipsvisitor/*.java
42+
src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipssyntaxtree/*.java
43+
src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipsparser/*.java
4444
src/main/java/org/twc/zerojavacompiler/facts_rules/Facts/*

‎pom.xml

+28-28
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@
4141
</goals>
4242
<configuration>
4343
<executable>java</executable>
44-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler</workingDirectory>
44+
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojava2spiglet</workingDirectory>
4545
<arguments>
4646
<argument>-jar</argument>
4747
<argument>${basedir}/lib/jtb132di.jar</argument>
4848
<argument>-te</argument>
4949
<argument>./zerojavaparser/zeroJava.jj</argument>
5050
<argument>-np</argument>
51-
<argument>org.twc.zerojavacompiler.zerojavasyntaxtree</argument>
51+
<argument>org.twc.zerojavacompiler.zerojava2spiglet.zerojavasyntaxtree</argument>
5252
<argument>-vp</argument>
53-
<argument>org.twc.zerojavacompiler.zerojavavisitor</argument>
53+
<argument>org.twc.zerojavacompiler.zerojava2spiglet.zerojavavisitor</argument>
5454
</arguments>
5555
</configuration>
5656
</execution>
@@ -62,7 +62,7 @@
6262
</goals>
6363
<configuration>
6464
<executable>javacc</executable>
65-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojavaparser</workingDirectory>
65+
<workingDirectory>src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavaparser</workingDirectory>
6666
<arguments>
6767
<argument>zeroJava-jtb.jj</argument>
6868
</arguments>
@@ -77,16 +77,16 @@
7777
</goals>
7878
<configuration>
7979
<executable>java</executable>
80-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler</workingDirectory>
80+
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/spiglet2kanga</workingDirectory>
8181
<arguments>
8282
<argument>-jar</argument>
8383
<argument>${basedir}/lib/jtb132di.jar</argument>
8484
<argument>-te</argument>
8585
<argument>./spigletparser/spiglet.jj</argument>
8686
<argument>-np</argument>
87-
<argument>org.twc.zerojavacompiler.spigletsyntaxtree</argument>
87+
<argument>org.twc.zerojavacompiler.spiglet2kanga.spigletsyntaxtree</argument>
8888
<argument>-vp</argument>
89-
<argument>org.twc.zerojavacompiler.spigletvisitor</argument>
89+
<argument>org.twc.zerojavacompiler.spiglet2kanga.spigletvisitor</argument>
9090
</arguments>
9191
</configuration>
9292
</execution>
@@ -98,7 +98,7 @@
9898
</goals>
9999
<configuration>
100100
<executable>javacc</executable>
101-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/spigletparser</workingDirectory>
101+
<workingDirectory>src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletparser</workingDirectory>
102102
<arguments>
103103
<argument>spiglet-jtb.jj</argument>
104104
</arguments>
@@ -113,16 +113,16 @@
113113
</goals>
114114
<configuration>
115115
<executable>java</executable>
116-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler</workingDirectory>
116+
<workingDirectory>src/main/java/org/twc/zerojavacompiler/kanga2zmips</workingDirectory>
117117
<arguments>
118118
<argument>-jar</argument>
119119
<argument>${basedir}/lib/jtb132di.jar</argument>
120120
<argument>-te</argument>
121121
<argument>./kangaparser/kanga.jj</argument>
122122
<argument>-np</argument>
123-
<argument>org.twc.zerojavacompiler.kangasyntaxtree</argument>
123+
<argument>org.twc.zerojavacompiler.kanga2zmips.kangasyntaxtree</argument>
124124
<argument>-vp</argument>
125-
<argument>org.twc.zerojavacompiler.kangavisitor</argument>
125+
<argument>org.twc.zerojavacompiler.kanga2zmips.kangavisitor</argument>
126126
</arguments>
127127
</configuration>
128128
</execution>
@@ -134,7 +134,7 @@
134134
</goals>
135135
<configuration>
136136
<executable>javacc</executable>
137-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/kangaparser</workingDirectory>
137+
<workingDirectory>src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangaparser</workingDirectory>
138138
<arguments>
139139
<argument>kanga-jtb.jj</argument>
140140
</arguments>
@@ -149,16 +149,16 @@
149149
</goals>
150150
<configuration>
151151
<executable>java</executable>
152-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler</workingDirectory>
152+
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsoptimizer</workingDirectory>
153153
<arguments>
154154
<argument>-jar</argument>
155155
<argument>${basedir}/lib/jtb132di.jar</argument>
156156
<argument>-te</argument>
157157
<argument>./zmipsparser/zmips.jj</argument>
158158
<argument>-np</argument>
159-
<argument>org.twc.zerojavacompiler.zmipssyntaxtree</argument>
159+
<argument>org.twc.zerojavacompiler.zmipsoptimizer.zmipssyntaxtree</argument>
160160
<argument>-vp</argument>
161-
<argument>org.twc.zerojavacompiler.zmipsvisitor</argument>
161+
<argument>org.twc.zerojavacompiler.zmipsoptimizer.zmipsvisitor</argument>
162162
</arguments>
163163
</configuration>
164164
</execution>
@@ -170,7 +170,7 @@
170170
</goals>
171171
<configuration>
172172
<executable>javacc</executable>
173-
<workingDirectory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsparser</workingDirectory>
173+
<workingDirectory>src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipsparser</workingDirectory>
174174
<arguments>
175175
<argument>zmips-jtb.jj</argument>
176176
</arguments>
@@ -259,21 +259,21 @@
259259
<filesets>
260260
<!-- zerojava -->
261261
<fileset>
262-
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojavasyntaxtree</directory>
262+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavasyntaxtree</directory>
263263
<includes>
264264
<include>**</include>
265265
</includes>
266266
<followSymlinks>false</followSymlinks>
267267
</fileset>
268268
<fileset>
269-
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojavavisitor</directory>
269+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavavisitor</directory>
270270
<includes>
271271
<include>**</include>
272272
</includes>
273273
<followSymlinks>false</followSymlinks>
274274
</fileset>
275275
<fileset>
276-
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojavaparser</directory>
276+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zerojava2spiglet/zerojavaparser</directory>
277277
<includes>
278278
<include>**/*.java</include>
279279
</includes>
@@ -284,21 +284,21 @@
284284
</fileset>
285285
<!-- spiglet -->
286286
<fileset>
287-
<directory>${basedir}/src/main/java/org/twc/spigletcompiler/spigletsyntaxtree</directory>
287+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletsyntaxtree</directory>
288288
<includes>
289289
<include>**</include>
290290
</includes>
291291
<followSymlinks>false</followSymlinks>
292292
</fileset>
293293
<fileset>
294-
<directory>${basedir}/src/main/java/org/twc/spigletcompiler/spigletvisitor</directory>
294+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletvisitor</directory>
295295
<includes>
296296
<include>**</include>
297297
</includes>
298298
<followSymlinks>false</followSymlinks>
299299
</fileset>
300300
<fileset>
301-
<directory>${basedir}/src/main/java/org/twc/spigletcompiler/spigletparser</directory>
301+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/spiglet2kanga/spigletparser</directory>
302302
<includes>
303303
<include>**/*.java</include>
304304
</includes>
@@ -309,21 +309,21 @@
309309
</fileset>
310310
<!-- kanga -->
311311
<fileset>
312-
<directory>${basedir}/src/main/java/org/twc/kangacompiler/kangasyntaxtree</directory>
312+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangasyntaxtree</directory>
313313
<includes>
314314
<include>**</include>
315315
</includes>
316316
<followSymlinks>false</followSymlinks>
317317
</fileset>
318318
<fileset>
319-
<directory>${basedir}/src/main/java/org/twc/kangacompiler/kangavisitor</directory>
319+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangavisitor</directory>
320320
<includes>
321321
<include>**</include>
322322
</includes>
323323
<followSymlinks>false</followSymlinks>
324324
</fileset>
325325
<fileset>
326-
<directory>${basedir}/src/main/java/org/twc/kangacompiler/kangaparser</directory>
326+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/kanga2zmips/kangaparser</directory>
327327
<includes>
328328
<include>**/*.java</include>
329329
</includes>
@@ -334,21 +334,21 @@
334334
</fileset>
335335
<!-- zMIPS -->
336336
<fileset>
337-
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipssyntaxtree</directory>
337+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipssyntaxtree</directory>
338338
<includes>
339339
<include>**</include>
340340
</includes>
341341
<followSymlinks>false</followSymlinks>
342342
</fileset>
343343
<fileset>
344-
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsvisitor</directory>
344+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipsvisitor</directory>
345345
<includes>
346346
<include>**</include>
347347
</includes>
348348
<followSymlinks>false</followSymlinks>
349349
</fileset>
350350
<fileset>
351-
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsparser</directory>
351+
<directory>${basedir}/src/main/java/org/twc/zerojavacompiler/zmipsoptimizer/zmipsparser</directory>
352352
<includes>
353353
<include>**/*.java</include>
354354
</includes>

0 commit comments

Comments
 (0)