summaryrefslogtreecommitdiff
path: root/chapter23/src/test/java
diff options
context:
space:
mode:
Diffstat (limited to 'chapter23/src/test/java')
-rw-r--r--chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java2
-rw-r--r--chapter23/src/test/java/com/seaofnodes/simple/Simple.java7
-rw-r--r--chapter23/src/test/java/com/seaofnodes/simple/progs/jig.smp31
3 files changed, 19 insertions, 21 deletions
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java b/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java
index 13322d3d..f6410b6a 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Chapter22Test.java
@@ -13,7 +13,7 @@ import static org.junit.Assert.*;
public class Chapter22Test {
- @Test @Ignore
+ @Test
public void testJig() throws IOException {
String src = Files.readString(Path.of("src/test/java/com/seaofnodes/simple/progs/jig.smp"));
//String src = Files.readString(Path.of("docs/examples/BubbleSort.smp"));
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/Simple.java b/chapter23/src/test/java/com/seaofnodes/simple/Simple.java
index 5eab4842..f765d939 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/Simple.java
+++ b/chapter23/src/test/java/com/seaofnodes/simple/Simple.java
@@ -143,9 +143,10 @@ Options:
System.out.printf( "TOTAL COMPILATION TIME: %.3f sec%n", total);
}
- static String getInput() {
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- return reader.lines().collect(Collectors.joining("\n"));
+ static String getInput() throws IOException {
+ try (BufferedReader reader = new BufferedReader(new InputStreamReader(System.in))) {
+ return reader.lines().collect(Collectors.joining("\n"));
+ }
}
public static void main(String[] args) throws Exception {
diff --git a/chapter23/src/test/java/com/seaofnodes/simple/progs/jig.smp b/chapter23/src/test/java/com/seaofnodes/simple/progs/jig.smp
index 001e8eae..f7a5d202 100644
--- a/chapter23/src/test/java/com/seaofnodes/simple/progs/jig.smp
+++ b/chapter23/src/test/java/com/seaofnodes/simple/progs/jig.smp
@@ -1,19 +1,16 @@
// -*- mode: java; -*-
-//2298769344378917493
-//========= Reduced =========
-struct s0 {
- bool v1;
- i16 v2;
- int v3;
- i8 v4;
- byte v5;
-};
-while(new s0.v3)
- while(new s0.v5<<new s0.v4) {}
-if(0) {
- if(0) {
- flt !P5ZUD4=new s0.v2;
+val fib = {int n ->
+ int temp=0;
+ int f1=1;
+ int f2=1;
+ int i=n;
+ while( i>1 ){
+ temp = f1+f2;
+ f1=f2;
+ f2=temp;
+ i=i-1;
}
- while(0) {}
-}
-return new s0.v1;
+ return f2;
+};
+
+fib(10);