diff options
author | Kartik K. Agaram <vc@akkartik.com> | 2015-10-27 11:31:05 -0700 |
---|---|---|
committer | Kartik K. Agaram <vc@akkartik.com> | 2015-10-27 11:31:05 -0700 |
commit | 8619c61840d02568de7b5c79ee4dee660345fccc (patch) | |
tree | a22015f16885f67143cb420185667153de005b36 | |
parent | 7b8319f4b8b7b0c80d1e194fa586bfe1f8042fef (diff) | |
download | mu-8619c61840d02568de7b5c79ee4dee660345fccc.tar.gz |
2286
-rw-r--r-- | 011load.cc | 3 | ||||
-rw-r--r-- | 013literal_string.cc | 2 | ||||
-rw-r--r-- | 054dilated_reagent.cc | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/011load.cc b/011load.cc index 6fee184e..fceaff83 100644 --- a/011load.cc +++ b/011load.cc @@ -162,8 +162,9 @@ bool next_instruction(istream& in, instruction* curr) { } string next_word(istream& in) { - ostringstream out; skip_whitespace(in); + // End next_word Special-cases + ostringstream out; slurp_word(in, out); skip_whitespace(in); skip_comment(in); diff --git a/013literal_string.cc b/013literal_string.cc index 53654e5b..0e663d17 100644 --- a/013literal_string.cc +++ b/013literal_string.cc @@ -21,7 +21,7 @@ recipe main [ :(before "End Mu Types Initialization") Type_ordinal["literal-string"] = 0; -:(after "string next_word(istream& in)") +:(before "End next_word Special-cases") if (in.peek() == '[') { string result = slurp_quoted(in); skip_whitespace(in); diff --git a/054dilated_reagent.cc b/054dilated_reagent.cc index 70217ee4..756dc11d 100644 --- a/054dilated_reagent.cc +++ b/054dilated_reagent.cc @@ -10,7 +10,7 @@ recipe main [ //: First augment next_word to group balanced brackets together. -:(after "string next_word(istream& in)") +:(before "End next_word Special-cases") if (in.peek() == '(') return slurp_balanced_bracket(in); // curlies are like parens, but don't mess up labels |