diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-07-18 14:03:29 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-07-18 14:03:29 -0700 |
commit | 11c53a59dc6a6890889347484b73e34dd9bb2636 (patch) | |
tree | 3dc4d89c05fd094e20d0333401985f10048453c3 | |
parent | 5aa38b5237b60795fb119165993e80bd2e906555 (diff) | |
download | mu-11c53a59dc6a6890889347484b73e34dd9bb2636.tar.gz |
1816 - ack, accidental namespace collision
-rw-r--r-- | 082persist.cc | 8 | ||||
-rw-r--r-- | edit.mu | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/082persist.cc b/082persist.cc index 2c798cfb..63516bb2 100644 --- a/082persist.cc +++ b/082persist.cc @@ -1,13 +1,13 @@ //: Dead simple persistence. -//: 'read' - reads string from a hardcoded file +//: 'restore' - reads string from a hardcoded file //: 'save' - writes string to a hardcoded file :(before "End Primitive Recipe Declarations") -READ, +RESTORE, :(before "End Primitive Recipe Numbers") -Recipe_ordinal["read"] = READ; +Recipe_ordinal["restore"] = RESTORE; :(before "End Primitive Recipe Implementations") -case READ: { +case RESTORE: { products.resize(1); products.at(0).push_back(new_string(slurp("lesson/recipe.mu"))); break; diff --git a/edit.mu b/edit.mu index b66011a1..e6f4b014 100644 --- a/edit.mu +++ b/edit.mu @@ -3,7 +3,7 @@ recipe main [ local-scope open-console - initial-recipe:address:array:character <- read + initial-recipe:address:array:character <- restore initial-sandbox:address:array:character <- new [test 2, 2] env:address:programming-environment-data <- new-programming-environment 0:literal/screen, initial-recipe:address:array:character, initial-sandbox:address:array:character event-loop 0:literal/screen, 0:literal/console, env:address:programming-environment-data |