BlockPrototype: Add support for %n args

Resolves: #616
scratchcpp · Jan 4, 2025 · ce875ee · ce875ee
1 parent ba66d94
commit ce875ee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/scratch/blockprototype_p.cpp b/src/scratch/blockprototype_p.cpp
@@ -27,6 +27,7 @@ void BlockPrototypePrivate::setProcCode(const std::string &newProcCode)
             arg = false;
             switch (c) {
                 case 's':
+                case 'n':
                     argumentDefaults.push_back("");
                     argumentTypes.push_back(BlockPrototype::ArgType::StringNum);
                     break;

diff --git a/test/scratch_classes/blockprototype_test.cpp b/test/scratch_classes/blockprototype_test.cpp
@@ -17,16 +17,17 @@ TEST(BlockPrototypeTest, Constructors)
     ASSERT_TRUE(p2.argumentDefaults().empty());
     ASSERT_FALSE(p2.warp());
 
-    BlockPrototype p3("test %s block %s %b");
-    ASSERT_EQ(p3.procCode(), "test %s block %s %b");
+    BlockPrototype p3("test %s block %s %b test %n");
+    ASSERT_EQ(p3.procCode(), "test %s block %s %b test %n");
     ASSERT_EQ(
         p3.argumentTypes(),
         std::vector<BlockPrototype::ArgType>({
             BlockPrototype::ArgType::StringNum,
             BlockPrototype::ArgType::StringNum,
             BlockPrototype::ArgType::Bool,
+            BlockPrototype::ArgType::StringNum,
         }));
-    ASSERT_EQ(p3.argumentDefaults(), std::vector<Value>({ "", "", false }));
+    ASSERT_EQ(p3.argumentDefaults(), std::vector<Value>({ "", "", false, "" }));
     ASSERT_FALSE(p3.warp());
 }