diff --git a/README.md b/README.md index c486b0f42..ec2a70ef0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Inform 7 -v10.1.0-alpha.1+6Q72 'Krypton' (10 July 2020) +v10.1.0-alpha.1+6Q73 'Krypton' (13 July 2020) ## About Inform 7 diff --git a/build.txt b/build.txt index ddccd9c8f..a41ad9b1e 100644 --- a/build.txt +++ b/build.txt @@ -1,3 +1,3 @@ Prerelease: alpha.1 -Build Date: 10 July 2020 -Build Number: 6Q72 +Build Date: 13 July 2020 +Build Number: 6Q73 diff --git a/inblorb/Chapter 3/Solution Deviser.w b/inblorb/Chapter 3/Solution Deviser.w index 0617267a8..78914a298 100755 --- a/inblorb/Chapter 3/Solution Deviser.w +++ b/inblorb/Chapter 3/Solution Deviser.w @@ -231,7 +231,7 @@ void Solution::undo_XML_escapes_in_string(text_stream *p) { @ Note that all other ampersand-escapes are passed through verbatim. @ = - int c = 0; + wchar_t c = 0; if (Str::eq_wide_string(xml_escape, L"<")) c = '<'; if (Str::eq_wide_string(xml_escape, L">")) c = '>'; if (Str::eq_wide_string(xml_escape, L"&")) c = '&'; diff --git a/inform7/core-module/Chapter 15/Properties.w b/inform7/core-module/Chapter 15/Properties.w index e1785f711..3e784a3b6 100644 --- a/inform7/core-module/Chapter 15/Properties.w +++ b/inform7/core-module/Chapter 15/Properties.w @@ -513,9 +513,9 @@ void Properties::set_translation_S(property *prn, text_stream *t) { Properties::iname(prn); TEMPORARY_TEXT(T) LOOP_THROUGH_TEXT(pos, t) { - int c = Str::get(pos); + wchar_t c = Str::get(pos); if ((isalpha(c)) || (Characters::isdigit(c)) || (c == '_')) - PUT_TO(T, c); + PUT_TO(T, (int) c); else PUT_TO(T, '_'); } diff --git a/inform7/core-module/Chapter 20/Equations.w b/inform7/core-module/Chapter 20/Equations.w index c1131e8c7..19b43d191 100644 --- a/inform7/core-module/Chapter 20/Equations.w +++ b/inform7/core-module/Chapter 20/Equations.w @@ -626,7 +626,7 @@ int Equations::equation_symbol_legal(wording W) { wchar_t *p = Lexer::word_raw_text(Wordings::first_wn(W)); int j, letters = 0, digits = 0, name_legal = TRUE; for (j=0; p[j]; j++) { - int c = p[j]; + wchar_t c = p[j]; if (Characters::isdigit(c)) digits++; else if (Characters::isalpha(c)) { letters++; if (digits > 0) name_legal = FALSE; } else name_legal = FALSE; @@ -772,7 +772,7 @@ equation_node *Equations::eqn_parse(equation *eqn) { @ Note that symbol names can't begin with a digit. @ = - int c = p[i]; + wchar_t c = p[i]; if (Characters::isalpha(c)) @ else if (Characters::isdigit(c)) @ else @; @@ -881,7 +881,7 @@ capacity; and so is the number 0 itself. case ')': token = Equations::enode_new(CLOSE_BRACKET_EQN); bl--; break; default: { TEMPORARY_TEXT(symbol) - PUT_TO(symbol, c); + PUT_TO(symbol, (int) c); StandardProblems::equation_problem_S(_p_(PM_EquationOperatorUnrecognised), eqn, symbol, "the symbol '%3' is one that I don't recognise. I was " "expecting an arithmetic sign, '+', '-', '*','/', or '^', " diff --git a/inform7/core-module/Chapter 26/Compiled Text.w b/inform7/core-module/Chapter 26/Compiled Text.w index abef4385b..e89d4fa1b 100644 --- a/inform7/core-module/Chapter 26/Compiled Text.w +++ b/inform7/core-module/Chapter 26/Compiled Text.w @@ -206,15 +206,15 @@ void CompiledText::from_stream(OUTPUT_STREAM, text_stream *p, int options) { } if (options & CT_RAW) { for (i=from; ino_lp_tokens; tc++) { int lookahead = -1; if ((tc+1no_lp_tokens) && (lp->lp_tokens[tc+1].lpt_type == CHARACTER_LPT)) - lookahead = lp->lp_tokens[tc+1].token_char; + lookahead = (int) (lp->lp_tokens[tc+1].token_char); Produce::inv_primitive(Emit::tree(), IF_BIP); Produce::down(Emit::tree()); Produce::inv_primitive(Emit::tree(), EQ_BIP); @@ -1900,7 +1900,7 @@ note that the following uses the raw text of the word. WRITE("%lp_tokens[tc].token_wn); @ = - HTML::put(OUT, lp->lp_tokens[tc].token_char); + HTML::put(OUT, (int) lp->lp_tokens[tc].token_char); @ = if (Kinds::FloatingPoint::uses_floating_point(lp->kind_specified)) { @@ -2115,7 +2115,7 @@ the sorting measure. @ = TEMPORARY_TEXT(T) TEMPORARY_TEXT(tiny_string) - PUT_TO(tiny_string, lp->lp_tokens[tc].token_char); + PUT_TO(tiny_string, (int) lp->lp_tokens[tc].token_char); CompiledText::from_stream(T, tiny_string, CT_RAW); DISCARD_TEXT(tiny_string) Produce::inv_primitive(Emit::tree(), PRINT_BIP); diff --git a/inform7/if-module/Chapter 2/Interactive Fiction ID.w b/inform7/if-module/Chapter 2/Interactive Fiction ID.w index 1f92f5da3..7b09d1db3 100644 --- a/inform7/if-module/Chapter 2/Interactive Fiction ID.w +++ b/inform7/if-module/Chapter 2/Interactive Fiction ID.w @@ -29,7 +29,7 @@ text_stream *PL::Bibliographic::IFID::read_uuid(void) { int c; while (((c = fgetc(xf)) != EOF) /* the UUID file is plain text, not Unicode */ && (uuid_read++ < MAX_UUID_LENGTH-1)) - PUT_TO(uuid_text, Characters::toupper(c)); + PUT_TO(uuid_text, (int) Characters::toupper((wchar_t) c)); fclose(xf); return uuid_text; } diff --git a/inter/building-module/Chapter 2/Inter Schemas.w b/inter/building-module/Chapter 2/Inter Schemas.w index 77ea19ff0..4c3295956 100644 --- a/inter/building-module/Chapter 2/Inter Schemas.w +++ b/inter/building-module/Chapter 2/Inter Schemas.w @@ -1018,7 +1018,7 @@ optional, operand in |operand2|. @ = int at = pos; - int c = Str::get_at(from, ++at); + wchar_t c = Str::get_at(from, ++at); int iss_bitmap = 0; switch (c) { case '!': iss_bitmap = iss_bitmap | PERMIT_LOCALS_IN_TEXT_CMODE_ISSBM; c = Str::get_at(from, ++at); break; @@ -1041,7 +1041,7 @@ optional, operand in |operand2|. t->bracing = Str::duplicate(T); t->inline_command = substitute_ISINC; t->inline_modifiers = iss_bitmap; - t->constant_number = c - '1'; + t->constant_number = (int) c - (int) '1'; InterSchemas::add_token(sch, t); preceding_token = t; DISCARD_TEXT(T)