Recognize script numeric and int values as strings

src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherScriptInt.cpp

@@ -0,0 +1,29 @@
+#include "MenuMatcherScriptInt.h"
+
+MenuMatcherScriptInt::MenuMatcherScriptInt()
+= default;
+
+MatcherResult<SimpleParserValue> MenuMatcherScriptInt::CanMatch(ILexer<SimpleParserValue>*lexer, const unsigned tokenOffset)
+{
+    const auto& token = lexer->GetToken(tokenOffset);
+
+    if (token.m_type == SimpleParserValueType::INTEGER)
+        return MatcherResult<SimpleParserValue>::Match(1);
+
+    if (token.m_type != SimpleParserValueType::STRING)
+        return MatcherResult<SimpleParserValue>::NoMatch();
+
+    const auto& stringValue = token.StringValue();
+
+    if (stringValue.empty())
+        return MatcherResult<SimpleParserValue>::NoMatch();
+
+    char* endPtr;
+    // The return result does not matter here
+    const auto _ = strtol(&stringValue[0], &endPtr, 10);
+
+    if (endPtr != &stringValue[stringValue.size() - 1])
+        return MatcherResult<SimpleParserValue>::NoMatch();
+
+    return MatcherResult<SimpleParserValue>::Match(1);
+}

src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherScriptInt.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "Parsing/Simple/SimpleParserValue.h"
+#include "Parsing/Matcher/AbstractMatcher.h"
+
+class MenuMatcherScriptInt final : public AbstractMatcher<SimpleParserValue>
+{
+protected:
+    MatcherResult<SimpleParserValue> CanMatch(ILexer<SimpleParserValue>* lexer, unsigned tokenOffset) override;
+
+public:
+    MenuMatcherScriptInt();
+};

src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherScriptNumeric.cpp

@@ -0,0 +1,29 @@
+#include "MenuMatcherScriptNumeric.h"
+
+MenuMatcherScriptNumeric::MenuMatcherScriptNumeric()
+= default;
+
+MatcherResult<SimpleParserValue> MenuMatcherScriptNumeric::CanMatch(ILexer<SimpleParserValue>* lexer, const unsigned tokenOffset)
+{
+    const auto& token = lexer->GetToken(tokenOffset);
+
+    if (token.m_type == SimpleParserValueType::FLOATING_POINT || token.m_type == SimpleParserValueType::INTEGER)
+        return MatcherResult<SimpleParserValue>::Match(1);
+
+    if (token.m_type != SimpleParserValueType::STRING)
+        return MatcherResult<SimpleParserValue>::NoMatch();
+
+    const auto& stringValue = token.StringValue();
+
+    if (stringValue.empty())
+        return MatcherResult<SimpleParserValue>::NoMatch();
+
+    char* endPtr;
+    // The return result does not matter here
+    const auto _ = strtod(&stringValue[0], &endPtr);
+
+    if(endPtr != &stringValue[stringValue.size()])
+        return MatcherResult<SimpleParserValue>::NoMatch();
+
+    return MatcherResult<SimpleParserValue>::Match(1);
+}

src/ObjLoading/Parsing/Menu/Matcher/MenuMatcherScriptNumeric.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "Parsing/Simple/SimpleParserValue.h"
+#include "Parsing/Matcher/AbstractMatcher.h"
+
+class MenuMatcherScriptNumeric final : public AbstractMatcher<SimpleParserValue>
+{
+protected:
+    MatcherResult<SimpleParserValue> CanMatch(ILexer<SimpleParserValue>* lexer, unsigned tokenOffset) override;
+
+public:
+    MenuMatcherScriptNumeric();
+};

src/ObjLoading/Parsing/Menu/Sequence/EventHandlerSetScopeSequences.cpp

@@ -9,6 +9,8 @@
 #include "Parsing/Menu/Domain/EventHandler/CommonEventHandlerSetLocalVar.h"
 #include "Parsing/Menu/Matcher/MenuCommonMatchers.h"
 #include "Parsing/Menu/Matcher/MenuMatcherFactory.h"
+#include "Parsing/Menu/Matcher/MenuMatcherScriptInt.h"
+#include "Parsing/Menu/Matcher/MenuMatcherScriptNumeric.h"
 
 using namespace menu;
 
@@ -31,16 +33,16 @@ namespace menu
 
         _NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptStrictNumeric() const
         {
-            return Or({
-                Type(SimpleParserValueType::INTEGER).Transform([](const token_list_t& tokens)-> SimpleParserValue
+            return And({
+                MatcherFactoryWrapper<SimpleParserValue>(std::make_unique<MenuMatcherScriptNumeric>()).Transform([](const token_list_t& tokens)-> SimpleParserValue
                 {
                     const auto& firstToken = tokens[0].get();
+
+                    if (firstToken.m_type == SimpleParserValueType::INTEGER)
                         return SimpleParserValue::String(firstToken.GetPos(), new std::string(std::to_string(firstToken.IntegerValue())));
-                }),
-                Type(SimpleParserValueType::FLOATING_POINT).Transform([](const token_list_t& tokens)-> SimpleParserValue
-                {
-                    const auto& firstToken = tokens[0].get();
+                    if (firstToken.m_type == SimpleParserValueType::FLOATING_POINT)
                         return SimpleParserValue::String(firstToken.GetPos(), new std::string(std::to_string(firstToken.FloatingPointValue())));
+                    return SimpleParserValue::String(firstToken.GetPos(), new std::string(firstToken.StringValue()));
                 })
             });
         }
@@ -55,7 +57,21 @@ namespace menu
                     Type(SimpleParserValueType::IDENTIFIER),
                 }).Transform([](const token_list_t& tokens) -> SimpleParserValue
                 {
-                    return SimpleParserValue::Integer(tokens[0].get().GetPos(), static_cast<int>(ExpectedScriptToken::INT));
+                    return SimpleParserValue::Integer(tokens[0].get().GetPos(), static_cast<int>(ExpectedScriptToken::NUMERIC));
+                })
+            });
+        }
+
+        _NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptStrictInt() const
+        {
+            return And({
+                MatcherFactoryWrapper<SimpleParserValue>(std::make_unique<MenuMatcherScriptInt>()).Transform([](const token_list_t& tokens)-> SimpleParserValue
+                {
+                    const auto& firstToken = tokens[0].get();
+
+                    if (firstToken.m_type == SimpleParserValueType::INTEGER)
+                        return SimpleParserValue::String(firstToken.GetPos(), new std::string(std::to_string(firstToken.IntegerValue())));
+                    return SimpleParserValue::String(firstToken.GetPos(), new std::string(firstToken.StringValue()));
                 })
                 });
         }
@@ -63,11 +79,7 @@ namespace menu
         _NODISCARD MatcherFactoryWrapper<SimpleParserValue> ScriptInt() const
         {
             return Or({
-                Type(SimpleParserValueType::INTEGER).Transform([](const token_list_t& tokens)-> SimpleParserValue
-                {
-                    const auto& firstToken = tokens[0].get();
-                    return SimpleParserValue::String(firstToken.GetPos(), new std::string(std::to_string(firstToken.IntegerValue())));
-                }),
+                ScriptStrictInt(),
                 Or({
                     Type(SimpleParserValueType::CHARACTER),
                     Type(SimpleParserValueType::FLOATING_POINT),