Skip to content

Commit 9cb4312

Browse files
committed
Merge branch 'main' into autostory-ticks
2 parents 602c122 + 863f85a commit 9cb4312

File tree

181 files changed

+1669
-2330
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+1669
-2330
lines changed

Common/Cpp/ExpressionEvaluator.cpp

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -339,33 +339,8 @@ int64_t parse_expression(
339339
return stack[0];
340340
}
341341

342-
const std::map<std::string, int64_t>& SYMBOLS(){
343-
static const std::map<std::string, int64_t> SYMBOLS{
344-
{"TICKS_PER_SECOND", 125},
345-
};
346-
return SYMBOLS;
347-
}
348-
349-
350-
uint32_t parse_ticks_ui32(const std::string& expression){
351-
int64_t x = parse_expression(SYMBOLS(), expression);
352-
if (x < 0){
353-
throw ParseException("Value cannot be negative.");
354-
}
355-
if ((int32_t)x != x){
356-
throw ParseException("Overflow");
357-
}
358-
return (int32_t)x;
359-
}
360342

361343

362-
int32_t parse_ticks_i32(const std::string& expression){
363-
int64_t x = parse_expression(SYMBOLS(), expression);
364-
if ((int32_t)x != x){
365-
throw ParseException("Overflow");
366-
}
367-
return (int32_t)x;
368-
}
369344

370345

371346
}

Common/Cpp/ExpressionEvaluator.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ int64_t parse_expression(
1717
const std::string& expression
1818
);
1919

20-
uint32_t parse_ticks_ui32(const std::string& expression);
21-
int32_t parse_ticks_i32(const std::string& expression);
2220

2321

2422
}

Common/Cpp/Options/TimeExpressionOption.cpp

Lines changed: 0 additions & 355 deletions
This file was deleted.

0 commit comments

Comments
 (0)