* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/files/
@ 2020-05-12 14:59 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2020-05-12 14:59 UTC (permalink / raw
To: gentoo-commits
commit: 0ba5ef83c4faef54a1bff90bab73c9787756745e
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 14:48:56 2020 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Tue May 12 14:59:23 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba5ef83
dev-scheme/c-wrapper: fix build with >=dev-scheme/gauche-0.9.9
Closes: https://bugs.gentoo.org/721390
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
index 091b1e2da10..98dfaa2f945 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -8,7 +8,7 @@
/* skip the first line '# 1 "<stdin>"' */
Scm_ReadLineUnsafe(SCM_PORT(in));
-@@ -1682,16 +1683,26 @@
+@@ -1682,16 +1683,30 @@
}
}
@@ -28,7 +28,11 @@
- parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
}
+ while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
++#ifdef SCM_REGEXP_MULTI_LINE
++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++#else
+ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
++#endif
+ if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+ Scm_Error("[bug] unexpected EOF while parsing macro body");
+ }
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/files/
@ 2021-10-02 13:20 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2021-10-02 13:20 UTC (permalink / raw
To: gentoo-commits
commit: 62390628210b52ac46aaf708334fc39656e936a1
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 2 13:17:18 2021 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Sat Oct 2 13:20:16 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62390628
dev-scheme/c-wrapper: update patch
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch | 42 ++++++++++--------------
1 file changed, 18 insertions(+), 24 deletions(-)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
index 98dfaa2f945..46ab531b389 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gcc-5.patch
@@ -4,46 +4,40 @@
{
static ScmObj trigger_line = SCM_FALSE;
ScmObj line_str;
-+ ScmObj regexp = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++ ScmObj rx;
/* skip the first line '# 1 "<stdin>"' */
Scm_ReadLineUnsafe(SCM_PORT(in));
-@@ -1682,16 +1683,30 @@
+@@ -1682,7 +1683,22 @@
}
}
- while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
-- if (SCM_NULLP(macro_list)) {
-+ line_str = SCM_NIL;
-+ while (!SCM_NULLP(macro_list)) {
++ rx = Scm_RegComp(SCM_STRING(SCM_MAKE_STR_IMMUTABLE("^#\\s+\\d+\\s+\"<stdin>\"")), 0);
++ line_str = Scm_ReadLineUnsafe(SCM_PORT(in));
++ while (!SCM_EOFP(line_str)) {
+ ScmObj body_str = line_str;
-+ if (SCM_NULLP(body_str)
-+ && SCM_EOFP(body_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
- Scm_Error("[bug] lost macro body");
-- } else {
-- ScmObj pos_name_args = SCM_CDAR(macro_list);
-- macro_list = SCM_CDR(macro_list);
-- Scm_FilenameSet(SCM_CAAR(pos_name_args));
-- Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
-- parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
- }
+ while (!SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))
++ && SCM_STRING_LENGTH(line_str) >= 13
+#ifdef SCM_REGEXP_MULTI_LINE
-+ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str), SCM_UNDEFINED, SCM_UNDEFINED))) {
+#else
-+ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(regexp), SCM_STRING(line_str)))) {
++ && SCM_REGMATCHP(Scm_RegExec(SCM_REGEXP(rx), SCM_STRING(line_str)))) {
+#endif
+ if (SCM_EOFP(line_str = Scm_ReadLineUnsafe(SCM_PORT(in)))) {
+ Scm_Error("[bug] unexpected EOF while parsing macro body");
+ }
+ body_str = Scm_StringAppend2(SCM_STRING(body_str), SCM_STRING(line_str));
-+ line_str = SCM_NIL;
+ }
-+ ScmObj pos_name_args = SCM_CDAR(macro_list);
-+ macro_list = SCM_CDR(macro_list);
-+ Scm_FilenameSet(SCM_CAAR(pos_name_args));
-+ Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
-+ parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), body_str);
+ if (SCM_NULLP(macro_list)) {
+ Scm_Error("[bug] lost macro body");
+ } else {
+@@ -1690,7 +1706,7 @@
+ macro_list = SCM_CDR(macro_list);
+ Scm_FilenameSet(SCM_CAAR(pos_name_args));
+ Scm_LineNumberSet(SCM_INT_VALUE(SCM_CDAR(pos_name_args)));
+- parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), line_str);
++ parse_macro_body(SCM_CADR(pos_name_args), SCM_CDDR(pos_name_args), body_str);
+ }
}
- SCM_RETURN(SCM_UNDEFINED);
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/files/
@ 2023-10-26 12:47 Akinori Hattori
0 siblings, 0 replies; 3+ messages in thread
From: Akinori Hattori @ 2023-10-26 12:47 UTC (permalink / raw
To: gentoo-commits
commit: 0701206b79a0779afa5799bfc0130110451520e7
Author: Akinori Hattori <hattya <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 26 12:44:37 2023 +0000
Commit: Akinori Hattori <hattya <AT> gentoo <DOT> org>
CommitDate: Thu Oct 26 12:44:37 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0701206b
dev-scheme/c-wrapper: fix build with >=dev-scheme/gauche-0.9.13
Closes: https://bugs.gentoo.org/915963
Signed-off-by: Akinori Hattori <hattya <AT> gentoo.org>
.../files/c-wrapper-gauche-abi-0.98.patch | 34 ++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
index 15e8b6990cc7..6c9f0cb371b2 100644
--- a/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
+++ b/dev-scheme/c-wrapper/files/c-wrapper-gauche-abi-0.98.patch
@@ -12,6 +12,30 @@
} else {
Scm_Error("wrong slot number: %d", sa->slotNumber);
}
+--- a/src/c-lex.c
++++ b/src/c-lex.c
+@@ -992,11 +992,6 @@
+ SCM_RETURN(Scm_MakeInteger(v));
+ }
+
+-ScmObj Scm_ReadStringLiteral()
+-{
+- SCM_RETURN(read_string_literal());
+-}
+-
+ ScmObj Scm_ReadCharacterConstant()
+ {
+ SCM_RETURN(read_character_constant());
+--- a/src/c-lex.h
++++ b/src/c-lex.h
+@@ -78,7 +78,6 @@
+ extern ScmObj Scm_IsForceIdentifierSet(ScmObj v);
+ extern ScmObj Scm_ReadIdentifier(ScmObj l);
+ extern ScmObj Scm_ReadOperator(ScmObj c);
+-extern ScmObj Scm_ReadStringLiteral();
+ extern ScmObj Scm_ReadCharacterConstant();
+ extern ScmObj Scm_ReadOctalOrFlonum(ScmObj l);
+ extern ScmObj Scm_ReadDecimal(ScmObj l);
--- a/src/c-lexlib.stub
+++ b/src/c-lexlib.stub
@@ -40,7 +40,11 @@
@@ -26,3 +50,13 @@
"}"))
(define-cproc strtod (nptr::<const-cstring>)
+@@ -136,9 +140,6 @@
+ (define-cproc read-operator (c)
+ (call "Scm_ReadOperator"))
+
+-(define-cproc read-string-literal ()
+- (call "Scm_ReadStringLiteral"))
+-
+ (define-cproc read-character-constant ()
+ (call "Scm_ReadCharacterConstant"))
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-10-26 12:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-10-02 13:20 [gentoo-commits] repo/gentoo:master commit in: dev-scheme/c-wrapper/files/ Akinori Hattori
-- strict thread matches above, loose matches on Subject: below --
2023-10-26 12:47 Akinori Hattori
2020-05-12 14:59 Akinori Hattori
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox