From a654e4ecace2d506d1b10f1dde2c287ebe84ef37 Mon Sep 17 00:00:00 2001 From: "Kartik K. Agaram" Date: Sat, 26 Mar 2016 23:59:59 -0700 Subject: 2812 --- html/080display.cc.html | 51 +++++++++++++++++++++++++++++-------------------- 1 file changed, 30 insertions(+), 21 deletions(-) (limited to 'html/080display.cc.html') diff --git a/html/080display.cc.html b/html/080display.cc.html index 33fb161d..9b2a4acf 100644 --- a/html/080display.cc.html +++ b/html/080display.cc.html @@ -3,32 +3,40 @@ Mu - 080display.cc - - + + - + + + + -
+
 //: Take charge of the text-mode display and console.
 
 //:: Display management
 
 :(before "End Globals")
-long long int Display_row = 0, Display_column = 0;
+int Display_row = 0, Display_column = 0;
 bool Autodisplay = true;
 
 :(before "End Primitive Recipe Declarations")
@@ -43,8 +51,8 @@ put(Recipe_ordinal,case OPEN_CONSOLE: {
   tb_init();
   Display_row = Display_column = 0;
-  long long int width = tb_width();
-  long long int height = tb_height();
+  int width = tb_width();
+  int height = tb_height();
   if (width > 222 || height > 222) tb_shutdown();
   if (width > 222)
     raise << "sorry, mu doesn't support windows wider than 222 characters. Please resize your window.\n" << end();
@@ -109,8 +117,8 @@ put(Recipe_ordinal,}
 :(before "End Primitive Recipe Implementations")
 case CLEAR_LINE_ON_DISPLAY: {
-  long long int width = tb_width();
-  for (long long int x = Display_column; x < width; ++x) {
+  int width = tb_width();
+  for (int x = Display_column; x < width; ++x) {
     tb_change_cell(x, Display_row, ' ', TB_WHITE, TB_BLACK);
   }
   tb_set_cursor(Display_column, Display_row);
@@ -125,7 +133,7 @@ put(Recipe_ordinal,:(before "End Primitive Recipe Checks")
 case PRINT_CHARACTER_TO_DISPLAY: {
   if (inst.ingredients.empty()) {
-    raise << maybe(get(Recipe, r).name) << "'print-character-to-display' requires at least one ingredient, but got " << to_string(inst) << '\n' << end();
+    raise << maybe(get(Recipe, r).name) << "'print-character-to-display' requires at least one ingredient, but got " << to_original_string(inst) << '\n' << end();
     break;
   }
   if (!is_mu_number(inst.ingredients.at(0))) {
@@ -149,9 +157,9 @@ put(Recipe_ordinal,:(before "End Primitive Recipe Implementations")
 case PRINT_CHARACTER_TO_DISPLAY: {
   int h=tb_height(), w=tb_width();
-  long long int height = (h >= 0) ? h : 0;
-  long long int width = (w >= 0) ? w : 0;
-  long long int c = ingredients.at(0).at(0);
+  int height = (h >= 0) ? h : 0;
+  int width = (w >= 0) ? w : 0;
+  int c = ingredients.at(0).at(0);
   int color = TB_BLACK;
   if (SIZE(ingredients) > 1) {
     color = ingredients.at(1).at(0);
@@ -211,7 +219,7 @@ put(Recipe_ordinal,:(before "End Primitive Recipe Checks")
 case MOVE_CURSOR_ON_DISPLAY: {
   if (SIZE(inst.ingredients) != 2) {
-    raise << maybe(get(Recipe, r).name) << "'move-cursor-on-display' requires two ingredients, but got " << to_string(inst) << '\n' << end();
+    raise << maybe(get(Recipe, r).name) << "'move-cursor-on-display' requires two ingredients, but got " << to_original_string(inst) << '\n' << end();
     break;
   }
   if (!is_mu_number(inst.ingredients.at(0))) {
@@ -244,7 +252,7 @@ put(Recipe_ordinal,:(before "End Primitive Recipe Implementations")
 case MOVE_CURSOR_DOWN_ON_DISPLAY: {
   int h=tb_height();
-  long long int height = (h >= 0) ? h : 0;
+  int height = (h >= 0) ? h : 0;
   if (Display_row < height-1) {
     Display_row++;
     tb_set_cursor(Display_column, Display_row);
@@ -282,7 +290,7 @@ put(Recipe_ordinal,:(before "End Primitive Recipe Implementations")
 case MOVE_CURSOR_RIGHT_ON_DISPLAY: {
   int w=tb_width();
-  long long int width = (w >= 0) ? w : 0;
+  int width = (w >= 0) ? w : 0;
   if (Display_column < width-1) {
     Display_column++;
     tb_set_cursor(Display_column, Display_row);
@@ -527,3 +535,4 @@ put(Recipe_ordinal,
 
 
+
-- 
cgit 1.4.1-2-gfad0