From 2df9e0c342edb9c2add2b234842897805d57b3e2 Mon Sep 17 00:00:00 2001
From: Mark Olesen <Mark.Olesen@Germany>
Date: Tue, 15 Dec 2009 08:38:06 +0100
Subject: [PATCH] Add very rudimentary output support for wide-characters.
---
src/OpenFOAM/Make/files | 4 +-
.../primitives/{ => chars}/char/char.H | 0
.../primitives/{ => chars}/char/charIO.C | 0
src/OpenFOAM/primitives/chars/wchar/wchar.H | 66 +++++++++++++++++++
src/OpenFOAM/primitives/chars/wchar/wcharIO.C | 62 +++++++++++++++++
5 files changed, 131 insertions(+), 1 deletion(-)
rename src/OpenFOAM/primitives/{ => chars}/char/char.H (100%)
rename src/OpenFOAM/primitives/{ => chars}/char/charIO.C (100%)
create mode 100644 src/OpenFOAM/primitives/chars/wchar/wchar.H
create mode 100644 src/OpenFOAM/primitives/chars/wchar/wcharIO.C
diff --git a/src/OpenFOAM/Make/files b/src/OpenFOAM/Make/files
index d9a30f3a824..9c18e725555 100644
--- a/src/OpenFOAM/Make/files
+++ b/src/OpenFOAM/Make/files
@@ -10,7 +10,9 @@ $(bools)/bool/boolIO.C
$(bools)/Switch/Switch.C
$(bools)/Switch/SwitchIO.C
-primitives/char/charIO.C
+chars = primitives/chars
+$(chars)/char/charIO.C
+$(chars)/wchar/wcharIO.C
ints = primitives/ints
$(ints)/int/intIO.C
diff --git a/src/OpenFOAM/primitives/char/char.H b/src/OpenFOAM/primitives/chars/char/char.H
similarity index 100%
rename from src/OpenFOAM/primitives/char/char.H
rename to src/OpenFOAM/primitives/chars/char/char.H
diff --git a/src/OpenFOAM/primitives/char/charIO.C b/src/OpenFOAM/primitives/chars/char/charIO.C
similarity index 100%
rename from src/OpenFOAM/primitives/char/charIO.C
rename to src/OpenFOAM/primitives/chars/char/charIO.C
diff --git a/src/OpenFOAM/primitives/chars/wchar/wchar.H b/src/OpenFOAM/primitives/chars/wchar/wchar.H
new file mode 100644
index 00000000000..c731a3dc814
--- /dev/null
+++ b/src/OpenFOAM/primitives/chars/wchar/wchar.H
@@ -0,0 +1,66 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Primitive
+ wchar_t
+
+Description
+ A wide-character and a pointer to a wide-character string.
+
+SourceFiles
+ wcharIO.C
+
+\*---------------------------------------------------------------------------*/
+
+#ifndef wchar_H
+#define wchar_H
+
+#include <cwchar>
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+namespace Foam
+{
+
+class Istream;
+class Ostream;
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+//- Output via a normal char
+Ostream& operator<<(Ostream&, const wchar_t);
+
+//- Output string via normal char
+Ostream& operator<<(Ostream&, const wchar_t*);
+
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+} // End namespace Foam
+
+// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+
+#endif
+
+// ************************************************************************* //
diff --git a/src/OpenFOAM/primitives/chars/wchar/wcharIO.C b/src/OpenFOAM/primitives/chars/wchar/wcharIO.C
new file mode 100644
index 00000000000..47a5ed05602
--- /dev/null
+++ b/src/OpenFOAM/primitives/chars/wchar/wcharIO.C
@@ -0,0 +1,62 @@
+/*---------------------------------------------------------------------------*\
+ ========= |
+ \\ / F ield | OpenFOAM: The Open Source CFD Toolbox
+ \\ / O peration |
+ \\ / A nd | Copyright (C) 2009-2009 OpenCFD Ltd.
+ \\/ M anipulation |
+-------------------------------------------------------------------------------
+License
+ This file is part of OpenFOAM.
+
+ OpenFOAM is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+
+ OpenFOAM is distributed in the hope that it will be useful, but WITHOUT
+ ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+ for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with OpenFOAM; if not, write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+Description
+ Reads a char from an input stream, for a given version
+ number and File format. If an ascii File is being read, then the line
+ numbers are counted and an erroneous read is reported.
+
+\*---------------------------------------------------------------------------*/
+
+#include "error.H"
+
+#include "wchar.H"
+#include "IOstreams.H"
+
+// * * * * * * * * * * * * * * * IOstream Operators * * * * * * * * * * * * //
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const wchar_t wc)
+{
+ os.write(char(wc));
+
+ os.check("Ostream& operator<<(Ostream&, const wchar_t)");
+ return os;
+}
+
+
+Foam::Ostream& Foam::operator<<(Ostream& os, const wchar_t* ws)
+{
+ if (ws)
+ {
+ for (const wchar_t* p = ws; *p; ++p)
+ {
+ os.write(char(*p));
+ }
+ }
+ os.check("Ostream& operator<<(Ostream&, const wchar_t*)");
+ return os;
+}
+
+
+// ************************************************************************* //
--
GitLab