From e87d643084978b95e48c40a6430357d00c39ee7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Villemot?= <sebastien@dynare.org>
Date: Wed, 20 Jul 2022 16:17:27 +0200
Subject: [PATCH] Preprocessor: various refactorings, mainly bytecode-related
---
mex/sources/bytecode/ErrorHandling.hh | 17 -----------------
mex/sources/bytecode/Evaluate.cc | 7 -------
preprocessor | 2 +-
3 files changed, 1 insertion(+), 25 deletions(-)
diff --git a/mex/sources/bytecode/ErrorHandling.hh b/mex/sources/bytecode/ErrorHandling.hh
index 0ddd5c69e1..a354fa67ae 100644
--- a/mex/sources/bytecode/ErrorHandling.hh
+++ b/mex/sources/bytecode/ErrorHandling.hh
@@ -1682,23 +1682,6 @@ public:
tmp_out << "else";
go_on = false;
break;
- case Tags::FCUML:
- if (compute)
- {
- v1f = Stackf.top();
- Stackf.pop();
- v2f = Stackf.top();
- Stackf.pop();
- Stackf.push(v1f+v2f);
- }
- v1 = Stack.top();
- Stack.pop();
- v2 = Stack.top();
- Stack.pop();
- tmp_out.str("");
- tmp_out << v1 << " + " << v2;
- Stack.push(tmp_out.str());
- break;
case Tags::FENDBLOCK:
case Tags::FENDEQU:
go_on = false;
diff --git a/mex/sources/bytecode/Evaluate.cc b/mex/sources/bytecode/Evaluate.cc
index 6b5549d2fe..18b9507bb7 100644
--- a/mex/sources/bytecode/Evaluate.cc
+++ b/mex/sources/bytecode/Evaluate.cc
@@ -1286,13 +1286,6 @@ Evaluate::compute_block_time(int Per_u_, bool evaluate, bool no_derivative)
Stack.push(TEFDD[{ indx, row-1, col-1 }]);
}
break;
- case Tags::FCUML:
- v1 = Stack.top();
- Stack.pop();
- v2 = Stack.top();
- Stack.pop();
- Stack.push(v1+v2);
- break;
case Tags::FENDBLOCK:
//it's the block end
#ifdef DEBUG
diff --git a/preprocessor b/preprocessor
index 89debf429a..1401c85d6a 160000
--- a/preprocessor
+++ b/preprocessor
@@ -1 +1 @@
-Subproject commit 89debf429a8b625fdb445eabf4c4463f1ed6c6db
+Subproject commit 1401c85d6ab79a2c3a3c42bbd446a4756b3e0493
--
GitLab