void WordsModule::start(void) { - Memory::reason_name(LEXER_TEXT_MREASON, "source text"); ho hum + Memory::reason_name(LEXER_TEXT_MREASON, "source text"); Memory::reason_name(LEXER_WORDS_MREASON, "source text details"); - Writers::register_writer(A, &WordAssemblages::writer); %A = write word assemblage - Writers::register_writer_I('N', &Lexer::writer); /* |%N| = write word with this number */ - Writers::register_writer('V', &Vocabulary::writer); /* |%V| = write vocabulary entry */ - Writers::register_writer_W('W', &Wordings::writer); /* |%W| = write wording */ + Writers::register_writer('A', &WordAssemblages::writer); %A = write word assemblage + Writers::register_writer_I('N', &Lexer::writer); %N = write word with this number + Writers::register_writer('V', &Vocabulary::writer); %V = write vocabulary entry + Writers::register_writer_W('W', &Wordings::writer); %W = write wording Log::declare_aspect(LEXICAL_OUTPUT_DA, L"lexical output", FALSE, FALSE); Log::declare_aspect(VOCABULARY_DA, L"vocabulary", FALSE, FALSE); - Writers::register_logger('f', WordAssemblages::log); /* |$f| = log word assemblage */ - Writers::register_logger('v', Vocabulary::log); /* |$v| = log vocabulary entry */ + Writers::register_logger('f', WordAssemblages::log); $f = log word assemblage + Writers::register_logger('v', Vocabulary::log); $v = log vocabulary entry Lexer::start(); Vocabulary::create_punctuation(); diff --git a/docs/words-module/2-vcb.html b/docs/words-module/2-vcb.html index a674480d1..4034c82cd 100644 --- a/docs/words-module/2-vcb.html +++ b/docs/words-module/2-vcb.html @@ -410,7 +410,7 @@ they're treated more like literal texts and I6 inclusions. unsigned int hash_code = 0; wchar_t *p = text; switch(*p) { - case '-': if (p[1] == 0) break; /* an isolated minus sign is an ordinary word */ + case '-': if (p[1] == 0) break; an isolated minus sign is an ordinary word and otherwise fall into... case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': diff --git a/docs/words-module/3-lxr.html b/docs/words-module/3-lxr.html index a2a9c0cfc..1116e1029 100644 --- a/docs/words-module/3-lxr.html +++ b/docs/words-module/3-lxr.html @@ -144,14 +144,14 @@ less than the following variable's value. characters cause word divisions, or signal literals. -define STRING_BEGIN '"' /* Strings are always double-quoted */ +define STRING_BEGIN '"' Strings are always double-quoted define STRING_END '"' -define TEXT_SUBSTITUTION_BEGIN '[' /* Inside strings, this denotes a text substitution */ +define TEXT_SUBSTITUTION_BEGIN '[' Inside strings, this denotes a text substitution define TEXT_SUBSTITUTION_END ']' define TEXT_SUBSTITUTION_SEPARATOR ',' -define COMMENT_BEGIN '[' /* Text between these, outside strings, is comment */ +define COMMENT_BEGIN '[' Text between these, outside strings, is comment define COMMENT_END ']' -define INFORM6_ESCAPE_BEGIN_1 '(' /* Text beginning with this pair is literal I6 code */ +define INFORM6_ESCAPE_BEGIN_1 '(' Text beginning with this pair is literal I6 code define INFORM6_ESCAPE_BEGIN_2 '-' define INFORM6_ESCAPE_END_1 '-' define INFORM6_ESCAPE_END_2 ')' @@ -626,7 +626,7 @@ always being "off"). lexer_allow_I6_escapes = TRUE; reset the internal states - lxs_most_significant_space_char = '\n'; /* we imagine each lexer feed starting a new line */ + lxs_most_significant_space_char = '\n'; we imagine each lexer feed starting a new line lxs_number_of_tab_stops = 0; but not yet indented with tabs lxs_this_line_is_empty_so_far = TRUE; clearly @@ -913,7 +913,7 @@ and the code in the previous paragraph has been watching them for us. else lw_array[lexer_wordcount].lw_break = lxs_most_significant_space_char; - lxs_most_significant_space_char = ' '; /* waiting for the next run of whitespace, after this word */ + lxs_most_significant_space_char = ' '; waiting for the next run of whitespace, after this word lxs_number_of_tab_stops = 0;
§26.8. Breaking strings up at text substitutions. When text contains text substitutions, these are ordinarily ignored by the @@ -1211,7 +1211,7 @@ to recording the character, so to get rid of the Lexer::feed_char_into_lexer(STRING_END); feed " to close the old string Lexer::feed_char_into_lexer(' '); Lexer::feed_char_into_lexer(TEXT_SUBSTITUTION_SEPARATOR); feed , to start new word - c = ' '; /* the lexer now goes on to record a space, which will end the |,| word */ + c = ' '; the lexer now goes on to record a space, which will end the , word lxs_scanning_text_substitution = TRUE; but remember that we must get back again } @@ -1243,7 +1243,7 @@ spurious space is never fed, and there is no problem. if ((lexer_divide_strings_at_text_substitutions) && (c == TEXT_SUBSTITUTION_END)) { lxs_scanning_text_substitution = FALSE; *(lexer_hwm-1) = TEXT_SUBSTITUTION_SEPARATOR; overwrite recorded copy of ] with , - Lexer::feed_char_into_lexer(' '); /* then feed a space to end the |,| word */ + Lexer::feed_char_into_lexer(' '); then feed a space to end the , word Lexer::feed_char_into_lexer(STRING_BEGIN); then feed " to open a new string } diff --git a/docs/words-module/3-tff.html b/docs/words-module/3-tff.html index 5748ee0e3..f81492990 100644 --- a/docs/words-module/3-tff.html +++ b/docs/words-module/3-tff.html @@ -126,13 +126,13 @@ instance, so they are not similarly converted. if (newline_char == '\x0d') { newline_char = 0; continue; suppress 0x000A when it follows 0x000D } - newline_char = cr; cr = '\n'; /* and otherwise convert to |'\n'| */ + newline_char = cr; cr = '\n'; and otherwise convert to '\n' break; case '\x0d': if (newline_char == '\x0a') { newline_char = 0; continue; suppress 0x000D when it follows 0x000A } - newline_char = cr; cr = '\n'; /* and otherwise convert to |'\n'| */ + newline_char = cr; cr = '\n'; and otherwise convert to '\n' break; default: newline_char = 0; @@ -182,11 +182,11 @@ quoted text (i.e., their text within double-quotes). inside quoted text, each run of non-whitespace counts as 1 word p++; skip opening quotation mark while (*p != 0) { - while ((*p == ' ') || (*p == NEWLINE_IN_STRING)) p++; /* move past white space */ - if ((*p == '"') || (*p == 0)) break; /* stop if this reaches the end */ + while ((*p == ' ') || (*p == NEWLINE_IN_STRING)) p++; move past white space + if ((*p == '"') || (*p == 0)) break; stop if this reaches the end N++; otherwise we have a word while ((*p != ' ') && (*p != NEWLINE_IN_STRING) - && (*p != '"') && (*p != 0)) p++; /* move to white space or end */ + && (*p != '"') && (*p != 0)) p++; move to white space or end } } else { outside quoted text, each lexer word not wholly composed of punctuation scores 1 diff --git a/docs/words-module/3-wrd.html b/docs/words-module/3-wrd.html index 6915babb6..8a7563917 100644 --- a/docs/words-module/3-wrd.html +++ b/docs/words-module/3-wrd.html @@ -425,7 +425,7 @@ and we return w2 void Wordings::writer(OUTPUT_STREAM, char *format_string, wording W) { switch (format_string[0]) { - case 'W': /* bare |%W| means the same as |%-W|, so fall through to... */ + case 'W': bare %W means the same as %-W, so fall through to... case '-': Write the stream with normalised casing22.1; break; case '+': Write the stream raw22.2; break; case '<': Write the stream in an abbreviated raw form22.3; break; diff --git a/shared/words-module/Chapter 1/Words Module.w b/shared/words-module/Chapter 1/Words Module.w index d4f1a6c14..79650ec66 100644 --- a/shared/words-module/Chapter 1/Words Module.w +++ b/shared/words-module/Chapter 1/Words Module.w @@ -35,7 +35,7 @@ DECLARE_CLASS(ptoken) = void WordsModule::start(void) { - Memory::reason_name(LEXER_TEXT_MREASON, "source text"); /* ho hum */ + Memory::reason_name(LEXER_TEXT_MREASON, "source text"); Memory::reason_name(LEXER_WORDS_MREASON, "source text details"); Writers::register_writer('A', &WordAssemblages::writer); /* |%A| = write word assemblage */