refactor: move table.cr to under ecc folder

soya-daizu · Jul 5, 2023 · 262c581 · 262c581
1 parent fde3f19
commit 262c581
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 23 deletions.
diff --git a/spec/rsdeflator_spec.cr b/spec/rsdeflator_spec.cr
@@ -19,7 +19,7 @@ module Goban
 
         version = QR::Version.new(3)
         ecl = ECC::Level::Quartile
-        ecc_codewords = EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][version.to_i] * EC_BLOCKS_QR[ecl.to_s][version.to_i]
+        ecc_codewords = ECC::EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][version.to_i] * ECC::EC_BLOCKS_QR[ecl.to_s][version.to_i]
         (ecc_codewords // 2).times do |i|
           corrupted[i] = Random.rand(256).to_u8
         end

diff --git a/src/goban/ecc/rsdeflator.cr b/src/goban/ecc/rsdeflator.cr
@@ -7,11 +7,11 @@ module Goban::ECC
 
       case version
       when QR::Version
-        ec_blocks_count = EC_BLOCKS_QR[ecl.to_s][version.to_i]
-        ec_block_size = EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][version.to_i]
+        ec_blocks_count = ECC::EC_BLOCKS_QR[ecl.to_s][version.to_i]
+        ec_block_size = ECC::EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][version.to_i]
       when RMQR::Version
-        ec_blocks_count = EC_BLOCKS_RMQR[ecl.to_s][version.to_i + 1]
-        ec_block_size = EC_CODEWORDS_PER_BLOCK_RMQR[ecl.to_s][version.to_i + 1]
+        ec_blocks_count = ECC::EC_BLOCKS_RMQR[ecl.to_s][version.to_i + 1]
+        ec_block_size = ECC::EC_CODEWORDS_PER_BLOCK_RMQR[ecl.to_s][version.to_i + 1]
       else
         raise InternalError.new("Unknown QR Type")
       end

diff --git a/src/goban/ecc/rsinflator.cr b/src/goban/ecc/rsinflator.cr
@@ -20,11 +20,11 @@ module Goban::ECC
 
       case version
       when QR::Version
-        ec_blocks_count = EC_BLOCKS_QR[ecl.to_s][version.to_i]
-        ec_block_size = EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][version.to_i]
+        ec_blocks_count = ECC::EC_BLOCKS_QR[ecl.to_s][version.to_i]
+        ec_block_size = ECC::EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][version.to_i]
       when RMQR::Version
-        ec_blocks_count = EC_BLOCKS_RMQR[ecl.to_s][version.to_i + 1]
-        ec_block_size = EC_CODEWORDS_PER_BLOCK_RMQR[ecl.to_s][version.to_i + 1]
+        ec_blocks_count = ECC::EC_BLOCKS_RMQR[ecl.to_s][version.to_i + 1]
+        ec_block_size = ECC::EC_CODEWORDS_PER_BLOCK_RMQR[ecl.to_s][version.to_i + 1]
       else
         raise InternalError.new("Unknown QR Type")
       end
@@ -63,7 +63,7 @@ module Goban::ECC
     def inflate_codewords(codewords : Slice(UInt8), version : MQR::Version, ecl : Level)
       raise InputError.new("Codewords size mismatch") if codewords.size != version.max_data_codewords(ecl)
 
-      ec_block_size = EC_CODEWORDS_MQR[ecl.to_s][version.to_i]
+      ec_block_size = ECC::EC_CODEWORDS_MQR[ecl.to_s][version.to_i]
       raw_codewords_count = version.raw_max_data_codewords
 
       result = Slice(UInt8).new(raw_codewords_count)

diff --git a/src/goban/tables.cr → src/goban/ecc/tables.cr b/src/goban/tables.cr → src/goban/ecc/tables.cr
@@ -1,4 +1,4 @@
-module Goban
+module Goban::ECC
   EC_CODEWORDS_PER_BLOCK_QR = {
     # Version: (note that index 0 is for padding, and is set to an illegal value)
     #           0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
@@ -10,11 +10,11 @@ module Goban
 
   EC_BLOCKS_QR = {
     # Version: (note that index 0 is for padding, and is set to an illegal value)
-    #           0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11,  12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
-    Low:      {-1, 1, 1, 1, 1, 1, 2, 2, 2, 2,  4,  4,   4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},
-    Medium:   {-1, 1, 1, 1, 2, 2, 4, 4, 4, 5,  5,  5,   8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},
-    Quartile: {-1, 1, 1, 2, 2, 4, 4, 6, 6, 8,  8,  8,  10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},
-    High:     {-1, 1, 1, 2, 4, 4, 4, 5, 6, 8,  8,  11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},
+    #           0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40
+    Low:      {-1, 1, 1, 1, 1, 1, 2, 2, 2, 2,  4,  4,  4,  4,  4,  6,  6,  6,  6,  7,  8,  8,  9,  9, 10, 12, 12, 12, 13, 14, 15, 16, 17, 18, 19, 19, 20, 21, 22, 24, 25},
+    Medium:   {-1, 1, 1, 1, 2, 2, 4, 4, 4, 5,  5,  5,  8,  9,  9, 10, 10, 11, 13, 14, 16, 17, 17, 18, 20, 21, 23, 25, 26, 28, 29, 31, 33, 35, 37, 38, 40, 43, 45, 47, 49},
+    Quartile: {-1, 1, 1, 2, 2, 4, 4, 6, 6, 8,  8,  8, 10, 12, 16, 12, 17, 16, 18, 21, 20, 23, 23, 25, 27, 29, 34, 34, 35, 38, 40, 43, 45, 48, 51, 53, 56, 59, 62, 65, 68},
+    High:     {-1, 1, 1, 2, 4, 4, 4, 5, 6, 8,  8, 11, 11, 16, 16, 18, 16, 19, 21, 25, 25, 25, 34, 30, 32, 35, 37, 40, 42, 45, 48, 51, 54, 57, 60, 63, 66, 70, 74, 77, 81},
   }
 
   EC_CODEWORDS_MQR = {

diff --git a/src/goban/mqr.cr b/src/goban/mqr.cr
@@ -1,6 +1,6 @@
 require "./abstract/*"
-require "./mqr/*"
 require "./ecc/*"
+require "./mqr/*"
 
 module Goban
   # Object that represents an encoded Micro QR Code symbol.

diff --git a/src/goban/mqr/version.cr b/src/goban/mqr/version.cr
@@ -52,7 +52,7 @@ struct Goban::MQR < Goban::AbstractQR
     # symbol of this version. This does not include the number of error correction
     # codewords.
     def max_data_codewords(ecl : ECC::Level)
-      ecc_codewords = EC_CODEWORDS_MQR[ecl.to_s][@value]
+      ecc_codewords = ECC::EC_CODEWORDS_MQR[ecl.to_s][@value]
       raise InputError.new("Invalid EC level or version") if ecc_codewords < 0
       raw_max_data_codewords - ecc_codewords
     end
@@ -61,7 +61,7 @@ struct Goban::MQR < Goban::AbstractQR
     # symbol of this version. This does not include the number of error correction
     # codewords.
     def max_data_bits(ecl : ECC::Level)
-      ecc_codewords = EC_CODEWORDS_MQR[ecl.to_s][@value]
+      ecc_codewords = ECC::EC_CODEWORDS_MQR[ecl.to_s][@value]
       raise InputError.new("Invalid EC level or version") if ecc_codewords < 0
       raw_data_mods_count - ecc_codewords * 8
     end

diff --git a/src/goban/qr.cr b/src/goban/qr.cr
@@ -1,6 +1,6 @@
 require "./abstract/*"
-require "./qr/*"
 require "./ecc/*"
+require "./qr/*"
 
 module Goban
   # Object that represents an encoded QR Code symbol.

diff --git a/src/goban/qr/version.cr b/src/goban/qr/version.cr
@@ -86,7 +86,7 @@ struct Goban::QR < Goban::AbstractQR
     # symbol of this version. This does not include the number of error correction
     # codewords.
     def max_data_codewords(ecl : ECC::Level)
-      ecc_codewords = EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][@value] * EC_BLOCKS_QR[ecl.to_s][@value]
+      ecc_codewords = ECC::EC_CODEWORDS_PER_BLOCK_QR[ecl.to_s][@value] * ECC::EC_BLOCKS_QR[ecl.to_s][@value]
       raise InputError.new("Invalid EC level or version") if ecc_codewords < 0
       raw_max_data_codewords - ecc_codewords
     end

diff --git a/src/goban/rmqr.cr b/src/goban/rmqr.cr
@@ -1,6 +1,6 @@
 require "./abstract/*"
-require "./rmqr/*"
 require "./ecc/*"
+require "./rmqr/*"
 
 module Goban
   # Object that represents an encoded rMQR Code symbol.

diff --git a/src/goban/rmqr/version.cr b/src/goban/rmqr/version.cr
@@ -190,7 +190,7 @@ struct Goban::RMQR < Goban::AbstractQR
     # symbol of this version. This does not include the number of error correction
     # codewords.
     def max_data_codewords(ecl : ECC::Level)
-      ecc_codewords = EC_CODEWORDS_PER_BLOCK_RMQR[ecl.to_s][@value.value + 1] * EC_BLOCKS_RMQR[ecl.to_s][@value.value + 1]
+      ecc_codewords = ECC::EC_CODEWORDS_PER_BLOCK_RMQR[ecl.to_s][@value.value + 1] * ECC::EC_BLOCKS_RMQR[ecl.to_s][@value.value + 1]
       raise InputError.new("Invalid EC level or version") if ecc_codewords < 0
       raw_max_data_codewords - ecc_codewords
     end