about summary refs log tree commit diff stats
path: root/tutorial
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2021-10-20 21:51:47 -0700
committerKartik K. Agaram <vc@akkartik.com>2021-10-20 21:51:47 -0700
commitefe918919a44f0d612cfe4b8f81895a7070cbe75 (patch)
treeab3fd2c969cb93b5fe068c52bb660d672ef86deb /tutorial
parent289e503a855f68138a8b40a807c0029c0c61179f (diff)
downloadmu-efe918919a44f0d612cfe4b8f81895a7070cbe75.tar.gz
thanks sejo for feedback
Diffstat (limited to 'tutorial')
-rw-r--r--tutorial/index.md19
-rw-r--r--tutorial/task1.mu3
2 files changed, 13 insertions, 9 deletions
diff --git a/tutorial/index.md b/tutorial/index.md
index 95f7b742..ea0d6948 100644
--- a/tutorial/index.md
+++ b/tutorial/index.md
@@ -51,7 +51,7 @@ cd mu
 Run a small program to start:
 
 ```
-./translate apps/ex5.mu
+./translate tutorial/task1.mu
 qemu-system-i386 code.img
 ```
 
@@ -59,7 +59,7 @@ If you aren't on Linux, the command for creating `code.img` will be slightly
 different:
 
 ```
-./translate_emulated apps/ex5.mu
+./translate_emulated tutorial/task1.mu
 qemu-system-i386 code.img
 ```
 
@@ -70,7 +70,7 @@ Either way, you should see this:
 If you have any trouble at this point, don't waste _any_ time thinking about
 it. Just [get in touch](http://akkartik.name/contact).
 
-(You can look at `apps/ex5.mu` at this point if you like. It's just a few
+(You can look at `tutorial/task1.mu` at this point if you like. It's just 3
 lines long. But don't worry if it doesn't make much sense.)
 
 ## Task 2: running tests
@@ -89,10 +89,11 @@ This time the screen will look like this:
 
 <img alt='screenshot of failing test on the Mu computer' src='task2.png'>
 
-Each of the dots is a _test_, a little self-contained and automated program
-run with an expected result. Mu comes with a lot of tests, and it always runs
-all tests before it runs any program. You may have missed the dots when you
-ran Task 1 because there were no failures. They were printed on the screen and
+Each of the dots represents a _test_, a little self-contained and automated
+program run and its results verified. Mu comes with a lot of tests (every
+function starting with 'test-' is a test), and it always runs all tests on
+boot before it runs any program. You may have missed the dots when you ran
+Task 1 because there were no failures. They were printed on the screen and
 then immediately erased. In Task 2, however, we've deliberately included a
 failing test. When any tests fail, Mu will immediately stop, showing you
 messages from failing tests and implicitly asking you to first fix them.
@@ -119,8 +120,8 @@ quotes.
 ## Task 4: your first Mu statement
 
 Mu is a statement-oriented language. Read the first section of the [Mu syntax
-description](https://github.com/akkartik/mu/blob/main/mu.md) to learn a little
-bit about it.
+description](https://github.com/akkartik/mu/blob/main/mu.md) (until the first
+sub-heading, "functions and calls") to learn a little bit about it.
 
 Here's a skeleton of a Mu function that's missing a single statement.
 
diff --git a/tutorial/task1.mu b/tutorial/task1.mu
new file mode 100644
index 00000000..37bcb547
--- /dev/null
+++ b/tutorial/task1.mu
@@ -0,0 +1,3 @@
+fn main screen: (addr screen), keyboard: (addr keyboard), data-disk: (addr disk) {
+  var dummy/eax: int <- draw-text-rightward screen, "hello from baremetal Mu!", 0x10/x, 0x400/xmax, 0x10/y, 0xa/fg, 0/bg
+}