From 96a11cddc1fb8576920310077e8d3006e32d7f94 Mon Sep 17 00:00:00 2001
From: Mark Fisher <mark.j.fisher@johnlewis.co.uk>
Date: Sat, 17 Oct 2020 14:47:29 +0100
Subject: [PATCH] Fixed typo and tests for conio comment

---
 .idea/jarRepositories.xml                           | 10 +++++-----
 .../Maven__org_antlr_antlr_runtime_3_5_2.xml        | 13 +++++++++++++
 kickc.iml                                           |  1 +
 src/main/kc/include/conio.h                         |  2 +-
 src/main/kc/lib/conio-nes.c                         |  2 +-
 src/test/ref/examples/conio/nacht-screen.asm        |  2 +-
 src/test/ref/examples/conio/nacht-screen.log        |  4 ++--
 7 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 .idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml

diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index bc3a852ae..e237fd66d 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -6,6 +6,11 @@
       <option name="name" value="Central Repository" />
       <option name="url" value="https://repo.maven.apache.org/maven2" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="project.local" />
+      <option name="name" value="project" />
+      <option name="url" value="file:$PROJECT_DIR$/repo" />
+    </remote-repository>
     <remote-repository>
       <option name="id" value="central" />
       <option name="name" value="Maven Central repository" />
@@ -16,10 +21,5 @@
       <option name="name" value="JBoss Community repository" />
       <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
     </remote-repository>
-    <remote-repository>
-      <option name="id" value="project.local" />
-      <option name="name" value="project" />
-      <option name="url" value="file:$PROJECT_DIR$/repo" />
-    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml
new file mode 100644
index 000000000..fbb9f137e
--- /dev/null
+++ b/.idea/libraries/Maven__org_antlr_antlr_runtime_3_5_2.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.antlr:antlr-runtime:3.5.2">
+    <CLASSES>
+      <root url="jar://$USER_HOME$/.m2/repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$USER_HOME$/.m2/repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$USER_HOME$/.m2/repository/org/antlr/antlr-runtime/3.5.2/antlr-runtime-3.5.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file
diff --git a/kickc.iml b/kickc.iml
index 0468924bf..7d72bdc9b 100644
--- a/kickc.iml
+++ b/kickc.iml
@@ -12,6 +12,7 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr4:4.8-1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:antlr-runtime:3.5.2" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.antlr:ST4:4.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: org.abego.treelayout:org.abego.treelayout.core:1.0.3" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.ibm.icu:icu4j:61.1" level="project" />
diff --git a/src/main/kc/include/conio.h b/src/main/kc/include/conio.h
index b2c667af6..f1823abe9 100644
--- a/src/main/kc/include/conio.h
+++ b/src/main/kc/include/conio.h
@@ -60,6 +60,6 @@ unsigned char kbhit (void);
 unsigned char cursor(unsigned char onoff);
 
 // If onoff is 1, scrolling is enabled when outputting past the end of the screen
-// If onoff is 1, scrolling is disabled and the cursor instead moves to (0,0)
+// If onoff is 0, scrolling is disabled and the cursor instead moves to (0,0)
 // The function returns the old scroll setting.
 unsigned char scroll(unsigned char onoff);
\ No newline at end of file
diff --git a/src/main/kc/lib/conio-nes.c b/src/main/kc/lib/conio-nes.c
index 35aebb12b..2b3b3c687 100644
--- a/src/main/kc/lib/conio-nes.c
+++ b/src/main/kc/lib/conio-nes.c
@@ -169,7 +169,7 @@ unsigned char cursor(unsigned char onoff) {
 }
 
 // If onoff is 1, scrolling is enabled when outputting past the end of the screen
-// If onoff is 1, scrolling is disabled and the cursor instead moves to (0,0)
+// If onoff is 0, scrolling is disabled and the cursor instead moves to (0,0)
 // The function returns the old scroll setting.
 unsigned char scroll(unsigned char onoff) {
     char old = conio_scroll_enable;
diff --git a/src/test/ref/examples/conio/nacht-screen.asm b/src/test/ref/examples/conio/nacht-screen.asm
index 032cc5726..24702c2d8 100644
--- a/src/test/ref/examples/conio/nacht-screen.asm
+++ b/src/test/ref/examples/conio/nacht-screen.asm
@@ -355,7 +355,7 @@ clrscr: {
     jmp __b3
 }
 // If onoff is 1, scrolling is enabled when outputting past the end of the screen
-// If onoff is 1, scrolling is disabled and the cursor instead moves to (0,0)
+// If onoff is 0, scrolling is disabled and the cursor instead moves to (0,0)
 // The function returns the old scroll setting.
 scroll: {
     .const onoff = 0
diff --git a/src/test/ref/examples/conio/nacht-screen.log b/src/test/ref/examples/conio/nacht-screen.log
index dd25f9e37..d2e8ab5c9 100644
--- a/src/test/ref/examples/conio/nacht-screen.log
+++ b/src/test/ref/examples/conio/nacht-screen.log
@@ -3735,7 +3735,7 @@ clrscr: {
 }
   // scroll
 // If onoff is 1, scrolling is enabled when outputting past the end of the screen
-// If onoff is 1, scrolling is disabled and the cursor instead moves to (0,0)
+// If onoff is 0, scrolling is disabled and the cursor instead moves to (0,0)
 // The function returns the old scroll setting.
 scroll: {
     .const onoff = 0
@@ -5558,7 +5558,7 @@ clrscr: {
 }
   // scroll
 // If onoff is 1, scrolling is enabled when outputting past the end of the screen
-// If onoff is 1, scrolling is disabled and the cursor instead moves to (0,0)
+// If onoff is 0, scrolling is disabled and the cursor instead moves to (0,0)
 // The function returns the old scroll setting.
 scroll: {
     .const onoff = 0