From fda30a3c8a7c6b06f02be40e3fd0740f893a1b4f Mon Sep 17 00:00:00 2001
From: Gaius Mulley <gaiusmod2@gmail.com>
Date: Tue, 1 Oct 2024 14:26:31 +0100
Subject: [PATCH] PR modula2/116918 -fswig correct syntax
This patch fixes the syntax for the generated swig interface file.
The % characters in fprintf require escaping.
gcc/m2/ChangeLog:
PR modula2/116918
* gm2-compiler/M2Swig.mod (AnnotateProcedure): Capitalize
the generated comment, split comment into multiple lines and
terminate the comment with ". */".
(DoCheckUnbounded): Escape the % character with %%.
(DoWriteFile): Ditto.
Signed-off-by: Gaius Mulley <gaiusmod2@gmail.com>
---
gcc/m2/gm2-compiler/M2Swig.mod | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/gcc/m2/gm2-compiler/M2Swig.mod b/gcc/m2/gm2-compiler/M2Swig.mod
index 194abd5fb786..b7f34426adb8 100644
--- a/gcc/m2/gm2-compiler/M2Swig.mod
+++ b/gcc/m2/gm2-compiler/M2Swig.mod
@@ -685,7 +685,7 @@ VAR
son, p, i: CARDINAL ;
needComma: BOOLEAN ;
BEGIN
- fprintf0(f, '/* parameter: ') ;
+ fprintf0(f, '/* Parameter: ') ;
p := NoOfParam(sym) ;
i := 1 ;
needComma := FALSE ;
@@ -695,14 +695,14 @@ BEGIN
THEN
IF needComma
THEN
- fprintf0(f, ', ')
+ fprintf0(f, ',\n ')
END ;
CalculateVarDirective(sym, son, TRUE) ;
needComma := TRUE
END ;
INC(i)
END ;
- fprintf0(f, ' */\n\n')
+ fprintf0(f, '. */\n\n')
END AnnotateProcedure ;
@@ -879,9 +879,9 @@ BEGIN
IF NOT includedArray
THEN
includedArray := TRUE ;
- fprintf0(f, '%include "carrays.i"\n')
+ fprintf0(f, '%%include "carrays.i"\n')
END ;
- fprintf0(f, '%') ;
+ fprintf0(f, '%%') ;
fprintf0(f, 'apply (char *STRING, int LENGTH) { (') ;
DoUnbounded(sym) ;
fprintf0(f, ') };\n') ;
@@ -908,12 +908,12 @@ VAR
BEGIN
mainModule := sym ;
n := GetSymName(sym) ;
- fprintf0(f, '/* automatically generated by gm2 -fswig */\n') ;
- fprintf0(f, '%') ;
+ fprintf0(f, '/* Automatically generated by gm2 -fswig. */\n') ;
+ fprintf0(f, '%%') ;
fprintf1(f, 'module %a\n\n', n) ;
- fprintf0(f, '%') ;
+ fprintf0(f, '%%') ;
fprintf1(f, 'include exception.i\n\n', n) ;
- fprintf0(f, '%') ;
+ fprintf0(f, '%%') ;
fprintf0(f, 'exception {\n') ;
fprintf0(f, ' try {\n') ;
fprintf0(f, ' $action\n') ;
@@ -922,9 +922,9 @@ BEGIN
fprintf0(f, ' }\n') ;
fprintf0(f, '}\n\n') ;
ForeachItemInListDo(Done, DoCheckUnbounded) ;
- fprintf0(f, '\n%{\n') ;
+ fprintf0(f, '\n%%{\n') ;
ForeachItemInListDo(Done, DoCheckExported) ;
- fprintf0(f, '%}\n\n') ;
+ fprintf0(f, '%%}\n\n') ;
ForeachItemInListDo(Done, DoCheckExported)
END DoWriteFile ;
--
GitLab