From 47725dd164d607f9542bc956b2ce2b159a1e3ee1 Mon Sep 17 00:00:00 2001
From: stepan <stepan.sindelar@oracle.com>
Date: Thu, 15 Mar 2018 14:07:07 +0100
Subject: [PATCH] Revert pre-processor changing SET_TYPE(x,y) to
x=SET_TYPE(x,y)
As this fails Rcpp compilation.
---
mx.fastr/mx_fastr_edinclude.py | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/mx.fastr/mx_fastr_edinclude.py b/mx.fastr/mx_fastr_edinclude.py
index 40d357e92e..5f2efebcfd 100644
--- a/mx.fastr/mx_fastr_edinclude.py
+++ b/mx.fastr/mx_fastr_edinclude.py
@@ -74,6 +74,9 @@ use_internals_end = '''#endif
'''
+# This rewrite is disabled, because it causes compilation error with Rcpp
+# The long term solution shall be to unify RPairList and RLanguage and
+# possibly RArgsValuesAndNames(?) to be able to change the type in place.
set_typeof_rewrite = '''#ifdef FASTR
SEXP SET_TYPEOF_FASTR(SEXP x, int v);
#ifndef NO_FASTR_REDEFINE
@@ -113,9 +116,10 @@ def ed_r_internals(gnu_dir):
rewrite_var(f, var, line)
else:
f.write(line)
- elif 'SET_TYPEOF' in line and '(SEXP' in line:
- f.write(line)
- f.write(set_typeof_rewrite)
+ # disabled because of compilations problems with Rcpp
+ # elif 'SET_TYPEOF' in line and '(SEXP' in line:
+ # f.write(line)
+ # f.write(set_typeof_rewrite)
else:
f.write(line)
--
GitLab