[c] Implement string concatenation.

Close #36
fusionlanguage · Aug 9, 2023 · 25a0675 · 25a0675
1 parent ae5f5fc
commit 25a0675
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 9 deletions.
diff --git a/GenC.fu b/GenC.fu
@@ -2390,8 +2390,17 @@ public class GenC : GenCCpp
 	{
 		switch (expr.Op) {
 		case FuToken.Plus:
-			if (expr.Type.Id == FuId.StringStorageType)
-				NotSupported(expr, "String concatenation");
+			if (expr.Type.Id == FuId.StringStorageType) {
+				this.StringFormat = true;
+				Include("stdarg.h");
+				Include("stdio.h");
+				Write("FuString_Format(\"%s%s\", ");
+				expr.Left.Accept(this, FuPriority.Argument);
+				Write(", ");
+				expr.Right.Accept(this, FuPriority.Argument);
+				WriteChar(')');
+				return;
+			}
 			break;
 		case FuToken.Equal:
 		case FuToken.NotEqual:

diff --git a/libfut.cpp b/libfut.cpp
@@ -10933,8 +10933,17 @@ void GenC::visitBinaryExpr(const FuBinaryExpr * expr, FuPriority parent)
 {
 	switch (expr->op) {
 	case FuToken::plus:
-		if (expr->type->id == FuId::stringStorageType)
-			notSupported(expr, "String concatenation");
+		if (expr->type->id == FuId::stringStorageType) {
+			this->stringFormat = true;
+			include("stdarg.h");
+			include("stdio.h");
+			write("FuString_Format(\"%s%s\", ");
+			expr->left->accept(this, FuPriority::argument);
+			write(", ");
+			expr->right->accept(this, FuPriority::argument);
+			writeChar(')');
+			return;
+		}
 		break;
 	case FuToken::equal:
 	case FuToken::notEqual:

diff --git a/libfut.cs b/libfut.cs
@@ -11238,8 +11238,17 @@ internal override void VisitBinaryExpr(FuBinaryExpr expr, FuPriority parent)
 		{
 			switch (expr.Op) {
 			case FuToken.Plus:
-				if (expr.Type.Id == FuId.StringStorageType)
-					NotSupported(expr, "String concatenation");
+				if (expr.Type.Id == FuId.StringStorageType) {
+					this.StringFormat = true;
+					Include("stdarg.h");
+					Include("stdio.h");
+					Write("FuString_Format(\"%s%s\", ");
+					expr.Left.Accept(this, FuPriority.Argument);
+					Write(", ");
+					expr.Right.Accept(this, FuPriority.Argument);
+					WriteChar(')');
+					return;
+				}
 				break;
 			case FuToken.Equal:
 			case FuToken.NotEqual:

diff --git a/libfut.js b/libfut.js
@@ -11591,8 +11591,17 @@ export class GenC extends GenCCpp
 	{
 		switch (expr.op) {
 		case FuToken.PLUS:
-			if (expr.type.id == FuId.STRING_STORAGE_TYPE)
-				this.notSupported(expr, "String concatenation");
+			if (expr.type.id == FuId.STRING_STORAGE_TYPE) {
+				this.#stringFormat = true;
+				this.include("stdarg.h");
+				this.include("stdio.h");
+				this.write("FuString_Format(\"%s%s\", ");
+				expr.left.accept(this, FuPriority.ARGUMENT);
+				this.write(", ");
+				expr.right.accept(this, FuPriority.ARGUMENT);
+				this.writeChar(41);
+				return;
+			}
 			break;
 		case FuToken.EQUAL:
 		case FuToken.NOT_EQUAL:

diff --git a/test/OpAddString.fu b/test/OpAddString.fu
@@ -4,7 +4,7 @@ public static class Test
 	{
 		string() s = "foo"; //FAIL: cl
 		string p = "bar";
-		return s + s == "foofoo" //FAIL: c
+		return s + s == "foofoo"
 			&& s + p == "foobar"
 			&& p + s == "barfoo"
 			&& p + p == "barbar"