img_to_script 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c994729915516c1b890ec338d85867ac2e8071d442f934c00f512645dbc42fa8
-  data.tar.gz: 9e396865898b8f4bb1644b9120b60163aa850d2e84118959f3a2e21fb914b982
+  metadata.gz: 711c09a2ddc4d5ac5df11d748d266acab0cc6ea9bf1ea4032e0074920629c373
+  data.tar.gz: be7bdc44d5393fa8ce073b4e18352f27d9182aa21dc2a1cef9d358ca8e7e8e35
 SHA512:
-  metadata.gz: d200b4b5f8494e54096941652285689e6bb27f85217381f260b37992dacf02fc428d1d8a902083497701d014739cc7f74435893e91f9afb03121bc524aa14d00
-  data.tar.gz: bbba0740ea201d70e330bcac059ae9f6904488585f9794e5e66b8f6b02d444cce053b2dfff6e8e6625c0decd70856e7298e57b8cc6d6d5e1154f642c360b9ecb
+  metadata.gz: 6648a5244cea7d45c22220b6b6e7e329eee5752335340bda94366a418677bd167bd9d14e3ee4b26836e3adf8cb943c101afd6cdcfe1df155e47a98fe80d7ee1d
+  data.tar.gz: a35c8376f8d67812710a890443fd77cec590dfeaaa353e021d41bc179504d8b203fb63d277a50668cbd08ca9d721b88cb06cf146281df75be1071b7cd91d3cf3

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [1.2.0] - 2024-01-27
+
+- New experimental feature: load and run another file at the end of the script.
+
+- Different pause subroutine.
+
+- Bug fix in the MK90 minificator.
+
 ## [1.1.0] - 2024-01-26
 
 - New generator: `HexMask::ForcedPointMove`.

data/README.md

@@ -170,6 +170,10 @@ script = task.run(
 
       Add a statement that marks the end of the program.
 
+   - run_another_file, default: ""
+
+      Load and run another script file at the end of the script. String argument represents a file ID (e.g., a filename). If the string is empty, no file should be loaded.
+
 - **ImgToScript::Generators::HexMask::Default**
 
    Specific for the Elektronika MK90 BASIC v.1.0 **only**.

data/lib/img_to_script/abs_token_type.rb

@@ -15,6 +15,7 @@ module ImgToScript
     DRAW_PIXEL_BY_ABS_COORDS = :draw_pixel_by_abs_coords
     GO_TO = :go_to
     IF_CONDITION = :if_condition
+    LOAD_AND_RUN = :load_and_run
     LOOP_BEGIN = :loop_begin
     LOOP_END = :loop_end
     MATH_ADD = :math_add
@@ -25,6 +26,7 @@ module ImgToScript
     PARENTHESES = :parentheses
     PROGRAM_BEGIN = :program_begin_lbl
     PROGRAM_END_LBL = :program_end_lbl
+    READ_KEY_VALUE = :read_key_value
     REMARK = :remark
     SIGN_FUNC = :sign_func
     SIGN_GREATER_THAN = :sign_greater_than

data/lib/img_to_script/abstract_token/load_and_run.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module ImgToScript
+  module AbstractToken
+    #
+    # Load and run another script file.
+    #
+    class LoadAndRun < AbstractToken
+      attr_reader :filename
+
+      def initialize(filename:, **)
+        @type = AbsTokenType::LOAD_AND_RUN
+        @filename = filename
+
+        super
+      end
+    end
+  end
+end

data/lib/img_to_script/abstract_token/read_key_value.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module ImgToScript
+  module AbstractToken
+    #
+    # Read a key value from the keyboard.
+    #
+    class ReadKeyValue < AbstractToken
+      def initialize(**)
+        @type = AbsTokenType::READ_KEY_VALUE
+
+        super
+      end
+    end
+  end
+end

data/lib/img_to_script/generators/generator.rb

@@ -14,6 +14,7 @@ module ImgToScript
       setting :pause_program, default: PAUSE_PROGRAM
       setting :program_begin_lbl, default: PRORGAM_BEGIN_LBL
       setting :program_end_lbl, default: PROGRAM_END_LBL
+      setting :run_another_file, default: ""
 
       #
       # Generate abstract tokens that represent the image.
@@ -44,12 +45,13 @@ module ImgToScript
       private
 
       def _generate_tokens
-        @tokens = [] # append new tokens here
+        @tokens = [] # append new tokens to this arr.
 
         _program_begin if config.program_begin_lbl
         _clear_screen if config.clear_screen
         _generate
         _program_pause if config.pause_program
+        _run_another_file unless config.run_another_file.empty?
         _program_end if config.program_end_lbl
       end
 
@@ -98,34 +100,55 @@ module ImgToScript
       # Append a sub-routine to pause the program.
       #
       def _program_pause
-        _loop_begin
-        _wait
-        _loop_end
+        _read_key_value
+        _check_key_value
+        _loop
       end
 
-      def _loop_begin
+      def _read_key_value
         @tokens.append(
-          AbstractToken::LoopBegin.new(
-            start_value: 1,
-            end_value: WAIT_LOOP_COUNT,
-            var_name: LOOP_VAR,
+          AbstractToken::AssignValue.new(
+            left: "K",
+            right: AbstractToken::ReadKeyValue.new,
             require_nl: true
           )
         )
       end
 
-      def _wait
+      def _check_key_value
+        expression = AbstractToken::MathGreaterThan.new(
+          left: "K",
+          right: "0"
+        )
+
+        consequent = AbstractToken::GoTo.new(
+          line: CurrentLinePlaceholder.new(2),
+          require_nl: false
+        )
+
         @tokens.append(
-          AbstractToken::Wait.new(
-            time: WAIT_TIME
+          AbstractToken::IfCondition.new(
+            expression: expression,
+            consequent: consequent,
+            require_nl: false
           )
         )
       end
 
-      def _loop_end
+      def _loop
         @tokens.append(
-          AbstractToken::LoopEnd.new(
-            var_name: LOOP_VAR
+          AbstractToken::GoTo.new(
+            line: CurrentLinePlaceholder.new(-1),
+            require_nl: true
+          )
+        )
+      end
+
+      def _run_another_file
+        @tokens.append(
+          AbstractToken::LoadAndRun.new(
+            filename: config.run_another_file,
+            require_nl: true
           )
         )
       end

data/lib/img_to_script/languages/mk90_basic/formatters/formatter.rb

@@ -40,7 +40,7 @@ module ImgToScript
           end
 
           def _calc_initial_line_number
-            @n_line = @line_offset - @line_step
+            @i_line = @line_offset - @line_step
           end
         end
       end

data/lib/img_to_script/languages/mk90_basic/formatters/minificator.rb

@@ -174,7 +174,7 @@ module ImgToScript
           end
 
           def _update_line_num
-            @n_line += @line_step
+            @i_line += @line_step
 
             # Since line number has been changed, it is required to
             # re-evaluate placeholders with the updated value.
@@ -210,7 +210,7 @@ module ImgToScript
           # @return [String]
           #
           def _select_line_label
-            @number_lines ? @n_line.to_s : ""
+            @number_lines ? @i_line.to_s : ""
           end
 
           #
@@ -242,7 +242,7 @@ module ImgToScript
           def _evaluate_placeholders
             @placeholders_idx.each do |i|
               e = @token.args[i]
-              @args[i] = @n_line + e.shift * @line_step
+              @args[i] = @i_line + e.shift * @line_step
             end
           end
 
@@ -296,6 +296,8 @@ module ImgToScript
           def _minificator
             Minificator.new.configure do |config|
               config.number_lines = false
+              config.line_offset = @i_line + @line_step
+              config.line_step = @line_step
             end
           end
 

data/lib/img_to_script/languages/mk90_basic/translators/mixin.rb

@@ -22,6 +22,10 @@ module ImgToScript
             _single_keyword(token, "END")
           end
 
+          def _read_key_value(token)
+            _single_keyword(token, "INC")
+          end
+
           def _data_store(token)
             MK90BasicToken.new(
               keyword: "DATA",

data/lib/img_to_script/languages/mk90_basic/translators/mk90_basic_10.rb

@@ -21,6 +21,17 @@ module ImgToScript
             )
           end
 
+          # MK90 BASIC v1.0 - load and run another BASIC file.
+          def _load_and_run(token)
+            MK90BasicToken.new(
+              keyword: "LOAD",
+              args: ["\"", token.filename, "\"", ",", "R"],
+              separator: "",
+              require_nl: token.require_nl,
+              sliceable: false
+            )
+          end
+
           # MK90 BASIC v.1.0 does support the DRAW O statement.
           def _move_point_to_abs_coords(token)
             MK90BasicToken.new(

data/lib/img_to_script/languages/mk90_basic/translators/mk90_basic_20.rb

@@ -21,6 +21,17 @@ module ImgToScript
             )
           end
 
+          # MK90 BASIC v2.0 - load and run another BASIC file.
+          def _load_and_run(token)
+            MK90BasicToken.new(
+              keyword: "LOAD",
+              args: ["\"", token.filename, "\"", ",", "A", ",", "R"],
+              separator: "",
+              require_nl: token.require_nl,
+              sliceable: false
+            )
+          end
+
           # MK90 BASIC v.2.0 does NOT support the DRAW O statement due to a bug,
           # the LOCATE statement should be used instead.
           def _move_point_to_abs_coords(token)

data/lib/img_to_script/languages/mk90_basic/translators/translator.rb

@@ -46,6 +46,8 @@ module ImgToScript
               _draw_chunk_by_hex_value(token)
             when AbsTokenType::MOVE_POINT_TO_ABS_COORDS
               _move_point_to_abs_coords(token)
+            when AbsTokenType::LOAD_AND_RUN
+              _load_and_run(token)
             when AbsTokenType::MATH_ADD
               _math_add(token)
             when AbsTokenType::MATH_SUB
@@ -64,6 +66,8 @@ module ImgToScript
               _loop_begin(token)
             when AbsTokenType::PROGRAM_END_LBL
               _program_end(token)
+            when AbsTokenType::READ_KEY_VALUE
+              _read_key_value(token)
             when AbsTokenType::LOOP_END
               _loop_end(token)
             when AbsTokenType::IF_CONDITION

data/lib/img_to_script/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ImgToScript
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: img_to_script
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - 8bit-mate
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-01-26 00:00:00.000000000 Z
+date: 2024-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: dry-system
@@ -118,6 +118,7 @@ files:
 - lib/img_to_script/abstract_token/draw_pixel_by_abs_coords.rb
 - lib/img_to_script/abstract_token/go_to.rb
 - lib/img_to_script/abstract_token/if_condition.rb
+- lib/img_to_script/abstract_token/load_and_run.rb
 - lib/img_to_script/abstract_token/loop_begin.rb
 - lib/img_to_script/abstract_token/loop_end.rb
 - lib/img_to_script/abstract_token/math_add.rb
@@ -128,6 +129,7 @@ files:
 - lib/img_to_script/abstract_token/parentheses.rb
 - lib/img_to_script/abstract_token/program_begin.rb
 - lib/img_to_script/abstract_token/program_end.rb
+- lib/img_to_script/abstract_token/read_key_value.rb
 - lib/img_to_script/abstract_token/remark.rb
 - lib/img_to_script/abstract_token/sign_func.rb
 - lib/img_to_script/abstract_token/wait.rb