Skip to content

Commit e7043f8

Browse files
isaacmaffeisisaacmaffeis
committed
updated STDL folder
1 parent d603c61 commit e7043f8

File tree

116 files changed

+3116
-2366
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+3116
-2366
lines changed

‎asmetal2java_asmgen/.idea/vcs.xml

+6
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asmetal2java_asmgen/bin/.gitignore

+38
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
target/
2+
!.mvn/wrapper/maven-wrapper.jar
3+
!**/src/main/**/target/
4+
!**/src/test/**/target/
5+
6+
### IntelliJ IDEA ###
7+
.idea/modules.xml
8+
.idea/jarRepositories.xml
9+
.idea/compiler.xml
10+
.idea/libraries/
11+
*.iws
12+
*.iml
13+
*.ipr
14+
15+
### Eclipse ###
16+
.apt_generated
17+
.classpath
18+
.factorypath
19+
.project
20+
.settings
21+
.springBeans
22+
.sts4-cache
23+
24+
### NetBeans ###
25+
/nbproject/private/
26+
/nbbuild/
27+
/dist/
28+
/nbdist/
29+
/.nb-gradle/
30+
build/
31+
!**/src/main/**/build/
32+
!**/src/test/**/build/
33+
34+
### VS Code ###
35+
.vscode/
36+
37+
### Mac OS ###
38+
.DS_Store

‎asmetal2java_asmgen/bin/.idea/.gitignore

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asmetal2java_asmgen/bin/.idea/checkstyle-idea.xml

+16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asmetal2java_asmgen/bin/.idea/misc.xml

+14
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎asmetal2java_asmgen/bin/Dockerfile

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM openjdk:17-alpine
2+
3+
WORKDIR /app
4+
5+
RUN mkdir -p /app/input
6+
RUN mkdir -p /app/output
7+
8+
VOLUME ["/app/input"]
9+
VOLUME ["/app/output"]
10+
11+
COPY ./target/asmetal2java_asmgen-0.0.1-SNAPSHOT-jar-with-dependencies.jar /app/asmetal2java_asmgen-0.0.1-SNAPSHOT-jar-with-dependencies.jar
12+
13+
ENTRYPOINT ["java", "-jar", "asmetal2java_asmgen-0.0.1-SNAPSHOT-jar-with-dependencies.jar"]

‎asmetal2java_asmgen/bin/examples/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.asm
2+
*.java
3+
*.txt
4+
!StandardLibrary.asm
5+
!CTLLibrary.asm
6+
!LTLLibrary.asm

‎asmetal2java_asmgen/examples/CTLLibrary.asm ‎asmetal2java_asmgen/bin/examples/CTLLibrary.asm

File renamed without changes.

‎asmetal2java_asmgen/examples/LTLLibrary.asm ‎asmetal2java_asmgen/bin/examples/LTLLibrary.asm

File renamed without changes.

‎asmetal2java_codegen/examples/StandardLibrary.asm ‎asmetal2java_asmgen/bin/examples/STDL/StandardLibrary.asm

+6-24
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ signature :
103103
static minus: Integer -> Integer
104104
static minus: Prod(Integer, Integer) -> Integer
105105
static mult: Prod(Integer, Integer) -> Integer
106-
static mult: Prod(Natural, Integer) -> Integer
107-
static mult: Prod(Integer, Natural) -> Integer
108106
static div: Prod(Integer, Integer) -> Real
109107
static abs: Integer -> Integer
110108
static idiv: Prod(Integer, Integer) -> Integer
@@ -116,21 +114,16 @@ signature :
116114
static toString: Integer -> String
117115
static lt: Prod(Integer, Integer) -> Boolean
118116
static gt: Prod(Integer, Integer) -> Boolean
119-
static gt: Prod(Natural, Integer) -> Boolean
120-
static gt: Prod(Integer, Natural) -> Boolean
121117
static le: Prod(Integer, Integer) -> Boolean
122118
static ge: Prod(Integer, Integer) -> Boolean
123119
//CONVERSION
124120
static itor: Integer -> Real
125121
static iton: Integer -> Natural
126-
static ntor: Natural -> Real
127-
static ntoi: Natural -> Integer
128122

129123
/*----------- Basic Functions on Natural --------------*/
130124
static plus: Prod(Natural, Natural) -> Natural
131125
static minus: Prod(Natural, Natural) -> Integer
132126
static mult: Prod(Natural, Natural) -> Natural
133-
static abs: Natural -> Natural
134127
static div: Prod(Natural, Natural) -> Real
135128
static idiv: Prod(Natural, Natural) -> Natural
136129
static mod: Prod(Natural, Natural) -> Natural
@@ -141,6 +134,9 @@ signature :
141134
static gt: Prod(Natural, Natural) -> Boolean
142135
static le: Prod(Natural, Natural) -> Boolean
143136
static ge: Prod(Natural, Natural) -> Boolean
137+
//CONVERSION
138+
static ntoi: Natural -> Integer
139+
static ntor: Natural -> Real
144140

145141
/*----------- Basic Functions on Char --------------*/
146142
static toString: Char -> String
@@ -177,8 +173,6 @@ signature :
177173
static getAgent: String -> Agent
178174
static program: Agent -> Rule
179175
controlled self: Agent
180-
static eq: Prod(Agent,Agent) -> Boolean
181-
static neq: Prod(Agent,Agent) -> Boolean
182176

183177
/*----------- Basic Functions on Sets--------------*/
184178
static size: Powerset(D)-> Integer
@@ -191,21 +185,18 @@ signature :
191185
static sum: Powerset(D) -> D
192186
static union: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
193187
static union: Prod(Powerset(D), Bag(D)) -> Bag(D)
194-
// add union with 2 different domanin 11/02/2021
195-
static union: Prod(Powerset(D), Powerset(D1)) -> Powerset(D2)
196-
// ANGELO 2018/7/31 perch� equality e non eq??? - parse rejects "a = {5}"
197188
static equality: Prod(Powerset(D), Powerset(D)) -> Boolean
198189
static intersection: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
199190
static intersection: Prod(Powerset(D), Bag(D)) -> Powerset(D)
200191
static difference: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
201192
static including: Prod(Powerset(D), D) -> Powerset(D)
202193
static excluding: Prod(Powerset(D), D) -> Powerset(D)
203194
static symmetricDifference: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
204-
//static count: Prod(Powerset(D),D) -> Natural // PA 18/12/2010 Maybe not needed on sets. An element either belong or not belong to a set. contains should be enough.
195+
//static count: Prod(Powerset(D),D) -> Natural // PA 18/12/2010 Forse non serve sui sets. Un elemento o appartiene o non appartiene ad un set. contains dovrebbe essere sufficiente.
205196
static asSequence: Powerset(D) -> Seq(D)
206197
static asBag: Powerset(D) -> Bag(D)
207198

208-
//Return one element of the given set, value undefined if set is empty
199+
//Return one element of the given set, behavior undefined if set is empty
209200
static chooseone: Powerset(D) -> D
210201

211202
/*----------- Basic Functions on Sequences--------------*/
@@ -214,7 +205,6 @@ signature :
214205
static isEmpty: Seq(D) -> Boolean
215206
static contains: Prod(Seq(D), D)-> Boolean
216207
static union: Prod(Seq(D), Seq(D)) -> Seq(D)
217-
// ANGELO 2018/7/31 equality is missing
218208
static append: Prod(Seq(D), D) -> Seq(D)
219209
static prepend: Prod(D, Seq(D)) -> Seq(D)
220210
static insertAt: Prod(Seq(D), Natural, D) -> Seq(D)
@@ -240,7 +230,7 @@ signature :
240230
static count: Prod(Bag(D),D) -> Natural
241231
static asSequence: Bag(D) -> Seq(D)
242232
static asSet: Bag(D) -> Powerset(D)
243-
static sum: Bag(D) -> D
233+
static sum: Bag(D) -> D//PA 2010/12/15 tenerla?
244234

245235
/*----------- Basic Functions on Maps--------------*/
246236
static merge: Prod(Map(D1,D2),Map(D1,D2)) -> Map(D1,D2)
@@ -314,12 +304,4 @@ signature :
314304

315305
static pre: D -> D
316306

317-
/*----------- Java time as static function--------------*/
318-
static currTimeNanosecs: Integer
319-
static currTimeMillisecs: Integer
320-
static currTimeSecs: Integer
321-
322-
323-
324-
325307
definitions:

‎asmetal2java_asmgen/examples/StandardLibrary.asm ‎asmetal2java_asmgen/bin/examples/StandardLibrary.asm

File renamed without changes.

‎asmetal2java_asmgen/bin/examples/compilazione/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.java

‎asmetal2java_asmgen/bin/examples/esecuzione/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.java

‎asmetal2java_asmgen/bin/examples/traduzione/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.java

‎asmetal2java_asmgen/bin/input/.gitignore

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
*.asm
2+
*.java
3+
*.txt
4+
!StandardLibrary.asm
5+
!CTLLibrary.asm
6+
!LTLLibrary.asm

‎asmetal2java_asmgen/input/CTLLibrary.asm ‎asmetal2java_asmgen/bin/input/CTLLibrary.asm

File renamed without changes.

‎asmetal2java_asmgen/input/LTLLibrary.asm ‎asmetal2java_asmgen/bin/input/LTLLibrary.asm

File renamed without changes.

‎asmetal2java_codegen/input/StandardLibrary.asm ‎asmetal2java_asmgen/bin/input/STDL/StandardLibrary.asm

+6-24
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,6 @@ signature :
103103
static minus: Integer -> Integer
104104
static minus: Prod(Integer, Integer) -> Integer
105105
static mult: Prod(Integer, Integer) -> Integer
106-
static mult: Prod(Natural, Integer) -> Integer
107-
static mult: Prod(Integer, Natural) -> Integer
108106
static div: Prod(Integer, Integer) -> Real
109107
static abs: Integer -> Integer
110108
static idiv: Prod(Integer, Integer) -> Integer
@@ -116,21 +114,16 @@ signature :
116114
static toString: Integer -> String
117115
static lt: Prod(Integer, Integer) -> Boolean
118116
static gt: Prod(Integer, Integer) -> Boolean
119-
static gt: Prod(Natural, Integer) -> Boolean
120-
static gt: Prod(Integer, Natural) -> Boolean
121117
static le: Prod(Integer, Integer) -> Boolean
122118
static ge: Prod(Integer, Integer) -> Boolean
123119
//CONVERSION
124120
static itor: Integer -> Real
125121
static iton: Integer -> Natural
126-
static ntor: Natural -> Real
127-
static ntoi: Natural -> Integer
128122

129123
/*----------- Basic Functions on Natural --------------*/
130124
static plus: Prod(Natural, Natural) -> Natural
131125
static minus: Prod(Natural, Natural) -> Integer
132126
static mult: Prod(Natural, Natural) -> Natural
133-
static abs: Natural -> Natural
134127
static div: Prod(Natural, Natural) -> Real
135128
static idiv: Prod(Natural, Natural) -> Natural
136129
static mod: Prod(Natural, Natural) -> Natural
@@ -141,6 +134,9 @@ signature :
141134
static gt: Prod(Natural, Natural) -> Boolean
142135
static le: Prod(Natural, Natural) -> Boolean
143136
static ge: Prod(Natural, Natural) -> Boolean
137+
//CONVERSION
138+
static ntoi: Natural -> Integer
139+
static ntor: Natural -> Real
144140

145141
/*----------- Basic Functions on Char --------------*/
146142
static toString: Char -> String
@@ -177,8 +173,6 @@ signature :
177173
static getAgent: String -> Agent
178174
static program: Agent -> Rule
179175
controlled self: Agent
180-
static eq: Prod(Agent,Agent) -> Boolean
181-
static neq: Prod(Agent,Agent) -> Boolean
182176

183177
/*----------- Basic Functions on Sets--------------*/
184178
static size: Powerset(D)-> Integer
@@ -191,21 +185,18 @@ signature :
191185
static sum: Powerset(D) -> D
192186
static union: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
193187
static union: Prod(Powerset(D), Bag(D)) -> Bag(D)
194-
// add union with 2 different domanin 11/02/2021
195-
static union: Prod(Powerset(D), Powerset(D1)) -> Powerset(D2)
196-
// ANGELO 2018/7/31 perch� equality e non eq??? - parse rejects "a = {5}"
197188
static equality: Prod(Powerset(D), Powerset(D)) -> Boolean
198189
static intersection: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
199190
static intersection: Prod(Powerset(D), Bag(D)) -> Powerset(D)
200191
static difference: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
201192
static including: Prod(Powerset(D), D) -> Powerset(D)
202193
static excluding: Prod(Powerset(D), D) -> Powerset(D)
203194
static symmetricDifference: Prod(Powerset(D), Powerset(D)) -> Powerset(D)
204-
//static count: Prod(Powerset(D),D) -> Natural // PA 18/12/2010 Maybe not needed on sets. An element either belong or not belong to a set. contains should be enough.
195+
//static count: Prod(Powerset(D),D) -> Natural // PA 18/12/2010 Forse non serve sui sets. Un elemento o appartiene o non appartiene ad un set. contains dovrebbe essere sufficiente.
205196
static asSequence: Powerset(D) -> Seq(D)
206197
static asBag: Powerset(D) -> Bag(D)
207198

208-
//Return one element of the given set, value undefined if set is empty
199+
//Return one element of the given set, behavior undefined if set is empty
209200
static chooseone: Powerset(D) -> D
210201

211202
/*----------- Basic Functions on Sequences--------------*/
@@ -214,7 +205,6 @@ signature :
214205
static isEmpty: Seq(D) -> Boolean
215206
static contains: Prod(Seq(D), D)-> Boolean
216207
static union: Prod(Seq(D), Seq(D)) -> Seq(D)
217-
// ANGELO 2018/7/31 equality is missing
218208
static append: Prod(Seq(D), D) -> Seq(D)
219209
static prepend: Prod(D, Seq(D)) -> Seq(D)
220210
static insertAt: Prod(Seq(D), Natural, D) -> Seq(D)
@@ -240,7 +230,7 @@ signature :
240230
static count: Prod(Bag(D),D) -> Natural
241231
static asSequence: Bag(D) -> Seq(D)
242232
static asSet: Bag(D) -> Powerset(D)
243-
static sum: Bag(D) -> D
233+
static sum: Bag(D) -> D//PA 2010/12/15 tenerla?
244234

245235
/*----------- Basic Functions on Maps--------------*/
246236
static merge: Prod(Map(D1,D2),Map(D1,D2)) -> Map(D1,D2)
@@ -314,12 +304,4 @@ signature :
314304

315305
static pre: D -> D
316306

317-
/*----------- Java time as static function--------------*/
318-
static currTimeNanosecs: Integer
319-
static currTimeMillisecs: Integer
320-
static currTimeSecs: Integer
321-
322-
323-
324-
325307
definitions:

‎asmetal2java_asmgen/input/StandardLibrary.asm ‎asmetal2java_asmgen/bin/input/StandardLibrary.asm

File renamed without changes.

‎asmetal2java_asmgen/bin/input/compilazione/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.java

‎asmetal2java_asmgen/bin/input/esecuzione/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.java

‎asmetal2java_asmgen/bin/input/traduzione/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
*.java

‎asmetal2java_asmgen/bin/output/.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
*.java
2+
*.txt

0 commit comments

Comments
 (0)