Bruce/nomsu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved tutorial.

Browse Source
This commit is contained in:
Bruce Hill 2019-01-27 02:08:53 -08:00
parent 1ff4e4d432
commit 92a603f199
1 changed files with 113 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

121
lib/tools/tutorial.nom
View File

@ -63,7 +63,7 @@ $lessons = [
for $num in [0, -1, 10, 4]:
$correct_answer = (4 * ($num * $num))
if (($num doubled then squared) != $correct_answer):
fail "Wrong answer for \$num!"
fail "Wrong answer for \($num)!"
lesson "Conditionals":
# Make this action return "big" if its argument
@ -85,6 +85,7 @@ $lessons = [
# Fix this action so the tests pass:
(the sum of $numbers) means:
$sum = 0
# You can loop over the values in a list like this:
for $number in $numbers:
# Hint: math expressions may need parentheses
@ -162,6 +163,7 @@ $lessons = [
lesson "Failure and Recovery":
$what_happened = "nothing"
# In Nomsu, sometimes things fail, but you can recover from failures with 'try':
try:
# The 'fail' action triggers failure
@ -247,16 +249,19 @@ $lessons = [
# Write a method called ($self, length) that returns the total
length of all the bits in the buffer:
<your code here>
$b = (a Buffer)
$b, add "xx"
$b, add "yyy"
assume (($b, length) == 5)
]
$(ask normally) = $(ask)
command line program with $args:
if ($args.help or $args.h):
say "Nomsu tutorial usage: nomsu -t tutorial [-x] [<location to put tutorial files>]"
say ("
Nomsu tutorial usage: nomsu -t tutorial [-x] [<location to put tutorial files>]
")
exit
say
@ -268,36 +273,61 @@ command line program with $args:
")
# For this tutorial questions are hilighted in bold cyan:
(ask $q) means (ask normally (bold (cyan $q)))
# Find the tutorial file directory:
if ($args.extras is empty):
$tutorial_dir = "./nomsu_tutorial"
if (not ($Files.exists $tutorial_dir)):
when (ask "The Nomsu tutorial files will be in \(bold $tutorial_dir) is that okay? [Y/n] ") is:
unless ($Files.exists $tutorial_dir):
when
ask ("
The Nomsu tutorial files will be in \$tutorial_dir is that okay? [Y/n] \;
")
..is:
"n" "N" "no":
say "Okay. If you want to specify another file location, run `nomsu -t tutorial <your location>`"
say ("
Okay. If you want to specify another file location, run `nomsu -t tutorial <your location>`
")
exit
..else:
$tutorial_dir = $args.extras.1
# Set up the tutorial file directory:
if (not ($Files.exists $tutorial_dir)):
sh> "mkdir \$tutorial_dir"
make directory $tutorial_dir
(filename of $i) means ("\($tutorial_dir)/lesson\$i.nom", with "//" -> "/")
for $lesson in $lessons at $i:
$filename = (filename of $i)
unless ($Files.exists $filename):
write $lesson.lesson to file $filename
if ($args.x):
# Display info about editing the tutorial files:
if $args.x:
say ("
The tutorial files are located in \$tutorial_dir.
You're in charge of editing them yourself.
")
..else:
$EDITOR = (($os.getenv "EDITOR") or "nano")
say ("
The tutorial will use \(yellow $EDITOR) for editing files.
If you'd rather edit the files in another window, use the \(yellow "-x") flag.
e.g. \(yellow "nomsu -t tutorial -x tutorials/")
")
(filename of $i) means ("\$tutorial_dir/lesson\$i.nom", with "//" -> "/")
for $lesson in $lessons at $i:
$filename = (filename of $i)
unless ($Files.exists $filename):
write $lesson.lesson to file $filename
$EDITOR = ($os.getenv "EDITOR")
if $EDITOR:
when
ask ("
\$EDITOR is your system editor, would you like this tutorial to use it? [Y/n] \;
")
..is:
"n" "N" "no":
$EDITOR = (nil)
unless $EDITOR:
say
$EDITOR =
ask ("
What program would you like to use to edit tutorial files?
(leave blank if you want to edit on your own in a different window)
> \;
")
if ($EDITOR == ""): $EDITOR = (nil)
(get failures) means [
: for $lesson in $lessons at $i:
@ -311,20 +341,21 @@ command line program with $args:
add {.lesson_number = $i, .failure = $msg}
]
say ""
say
say (bold "Lessons:")
(show first failure from $failures) means:
say ("
\(bold "Next thing to fix:") \(
bold (yellow "Lesson \($failures.1.lesson_number): \($lessons.($failures.1.lesson_number).name)")
bold
yellow ("
Lesson \($failures.1.lesson_number): \($lessons.($failures.1.lesson_number).name)
")
)
\($failures.1.failure, indented)
")
$failures = (get failures)
for $lesson in $lessons at $i:
for $f in $failures:
@ -332,17 +363,30 @@ command line program with $args:
say (bold (red " \$i. \($lesson.name) [incomplete]"))
do next $lesson
say (bold (green " \$i. \($lesson.name) [passed]"))
say "\n\(bold "Your progress:") \(20 wide (((#$lessons) - (#$failures)) / (#$lessons)) progress bar)"
repeat while (not ($failures is empty)):
say ("
\(bold "Your progress:") \(
20 wide (((#$lessons) - (#$failures)) / (#$lessons)) progress bar
)
")
repeat until ($failures is empty):
show first failure from $failures
if ($args.x):
# Have the user fix the first failure:
unless $EDITOR:
# If the user is using an external editor, wait for the file to change
$filename = (filename of $failures.1.lesson_number)
say "\(yellow "Waiting for you to fix ")\(bold $filename) \(yellow "(press ctrl+c to exit)...")"
say ("
\(yellow "Waiting for you to fix ")\(bold $filename) \
..\(yellow "(press ctrl+c to exit)...")
")
try:
$files = [: for $ in 1 to (#$lessons): add (read file (filename of $))]
repeat:
sh> "sleep 0.5"
sleep for 0.5 seconds
$new_files = [: for $ in 1 to (#$lessons): add (read file (filename of $))]
if ($new_files != $files):
$files = $new_files
@ -351,14 +395,11 @@ command line program with $args:
say "\nGoodbye."
exit
..else:
# If the user is using $EDITOR, launch it so they can edit the file:
$filename = (filename of $failures.1.lesson_number)
--- (retry file) ---
when
ask (bold (cyan "Edit \$filename to get it to pass? [Y/n/exit] "))
..is:
"q" "quit" "exit" "n" "N" "no":
exit
when (ask "Edit \$filename to get it to pass? [Y/n/exit] ") is:
"q" "quit" "exit" "n" "N" "no": exit
"y" "Y" "yes" "":
$f = (read file $filename)
[$line, $col] = ($failures.1.failure, match ":(%d+),(%d+)")
@ -377,10 +418,10 @@ command line program with $args:
sh> "\$EDITOR \$filename"
..else:
sh> "\$EDITOR \$filename"
else:
say "Sorry, I don't understand that."
go to (retry file)
$file = (read file $filename)
$file = ($NomsuCode, from (Source $filename 1 (#$file)) $file)
try:
@ -390,12 +431,13 @@ command line program with $args:
say (bold (red "\n There's a bit more to fix:"))
$msg = ($msg, with "\n *stack traceback:.*" -> "")
say ($msg, indented)
say ""
say
go to (retry file)
$prev_progress = (((#$lessons) - (#$failures)) / (#$lessons))
$failures = (get failures)
$progress = (((#$lessons) - (#$failures)) / (#$lessons))
# Update the progressbar if progess has changed:
if ($progress != $prev_progress):
if ($progress > $prev_progress):
say (bold (green "\nSuccess!\n"))
@ -407,9 +449,10 @@ command line program with $args:
$p = ($prev_progress to $progress mixed by $k)
say "\r\(bold "Your progress:") \(20 wide $p progress bar)" inline
$io.flush()
sh> "sleep \(1 / $N)"
say ""
sleep for (1 / $N) seconds
say
# All done, no more failures:
say ("
\(bold "\(slow blink "Congratulations!")")