diff --git a/source/main.adb b/source/main.adb index f4de683..6a62014 100644 --- a/source/main.adb +++ b/source/main.adb @@ -202,7 +202,7 @@ begin cursor_mode := 0; - xxx := import_text ("./source/attribute.ads"); + xxx := import_text ("./source/skill.ads"); main_menu_loop: loop synchronize; diff --git a/source/ui.adb b/source/ui.adb index 2f3e01a..82e17ca 100644 --- a/source/ui.adb +++ b/source/ui.adb @@ -601,18 +601,23 @@ package body ui is case buffer is when character'val (9) => offset.x := offset.x + 2 * width; when character'val (10) => offset.y := offset.y + 1 * height; offset.x := x; - when ':' | ';' | '+' | '*' | '/' | '.' | ',' | '(' | ')' | ''' | '=' | '<' | '>' => - ui.write (buffer & "", offset.x, offset.y, ( 0, 255, 255, 255), height, code => true); + when ':' | ';' | '.' | ',' | '=' | '<' | '>' => + ui.write (buffer & "", offset.x, offset.y, (63, 127, 255, 255), height, code => true); + when '+' | '*' | '/' | '|' | '&' => + ui.write (buffer & "", offset.x, offset.y, (63, 63, 255, 255), height, code => true); + when '(' | ')' | ''' => + ui.write (buffer & "", offset.x, offset.y, (63, 255, 255, 255), height, code => true); when '"' => - ui.write (buffer & "", offset.x, offset.y, (255, 127, 255, 255), height, code => true); + ui.write (buffer & "", offset.x, offset.y, (127, 63, 127, 255), height, code => true); offset.x := offset.x + width; loop core.increment (length); buffer := ada.strings.unbounded.element (text.text, length); - ui.write (buffer & "", offset.x, offset.y, (255, 127, 255, 255), height, code => true); + ui.write (buffer & "", offset.x, offset.y, (127, 63, 127, 255), height, code => true); offset.x := offset.x + width; exit when buffer = '"'; end loop; + offset.x := offset.x - width; when '-' => if ada.strings.unbounded.element (text.text, length + 1) = '-' then ui.write (buffer & "", offset.x, offset.y, (127, 127, 127, 255), height, code => true); @@ -626,11 +631,11 @@ package body ui is end loop; core.decrement (length); else - ui.write (buffer & "", offset.x, offset.y, ( 0, 255, 255, 255), height, code => true); + ui.write (buffer & "", offset.x, offset.y, (63, 63, 255, 255), height, code => true); end if; when '0' .. '9' => loop - ui.write (buffer & "", offset.x, offset.y, (0, 0, 255, 255), height, code => true); + ui.write (buffer & "", offset.x, offset.y, (127, 63, 255, 255), height, code => true); core.increment (length); buffer := ada.strings.unbounded.element (text.text, length); exit when buffer = ' ' or buffer = ';' or buffer = ')' or buffer = ','; @@ -650,7 +655,7 @@ package body ui is if word = "type" or word = "begin" or word = "end" or word = "when" or word = "others" or word = "procedure" or word = "function" or word = "package" or word = "body" or word = "if" or word = "then" or word = "else" or word = "elsif" or word = "case" or word = "is" or word = "and" or word = "or" or word = "xor" or word = "exit" or word = "constant" or word = "access" or word = "range" - or word = "subtype" or word = "array" or word = "in" or word = "out" or word = "return" or word = "for" + or word = "subtype" or word = "array" or word = "in" or word = "out" or word = "return" or word = "for" or word = "with" or word = "loop" or word = "while" or word = "of" or word = "null" or word = "record" or word = "use" or word = "mod" or word = "new" --~or word = "" --~or word = ""