Changeset 92 for cpp/gdk

Timestamp:

07/02/13 22:31:23 (11 years ago)

Author:

Maciej Komosinski

Message:

SString::valueOf(value) can handle more argument types

Location:

cpp/gdk

Files:

• extvalue.cpp (modified) (1 diff)
• extvalue.h (modified) (1 diff)
• sstring.cpp (modified) (3 diffs)
• sstring.h (modified) (2 diffs)

cpp/gdk/extvalue.cpp

@@ -7 +7 @@
 #include <math.h>
 
-SString ExtObject::toString()
+SString ExtObject::toString() const
 {
 if (isEmpty()) return SString("<empty object>");

cpp/gdk/extvalue.h

@@ -59 +59 @@
 int operator==(const ExtObject& src) {if (object!=src.object) return 0; return (object==0)?(param==src.param):1;}
 
-SString toString();
+SString toString() const;
 
 ExtObject(Param *p,void *o):subtype(2),object(o),param(p){}

cpp/gdk/sstring.cpp

@@ -6 +6 @@
 #include "sstring.h"
 #include "nonstd_stl.h"
-
+#include "extvalue.h"
 
 static int guessMemSize(int request, int memhint)
@@ -312 +312 @@
 return t;
 }
+const SString& SString::valueOf(long i)
+{
+static SString t;
+sprintf(t.directWrite(20),"%d",i); t.endWrite();
+return t;
+}
 const SString& SString::valueOf(double d)
 {
@@ -318 +324 @@
 return t;
 }
+const SString& SString::valueOf(const SString& s)
+{
+return s;
+}
+SString SString::valueOf(const ExtValue& v)
+{
+return v.getString();
+}
+SString SString::valueOf(const ExtObject& v)
+{
+return v.toString();
+}
 
 SString &SString::empty()

cpp/gdk/sstring.h

@@ -9 +9 @@
 #include <stdlib.h>
 #include <stdio.h>
+
+class ExtValue;  //this include would result in recurrent inclusion: #include "extvalue.h"
+class ExtObject;
 
 class SBuf
@@ -155 +158 @@
 
 static const SString& valueOf(int);
+static const SString& valueOf(long);
 static const SString& valueOf(double);
+static const SString& valueOf(const SString&); //tylko do kompletu zeby mozna uzyc tej funkcji nie martwiac sie o typ argumentu
+static SString valueOf(const ExtValue&); //tylko do kompletu zeby mozna uzyc tej funkcji nie martwiac sie o typ argumentu
+static SString valueOf(const ExtObject&); //tylko do kompletu zeby mozna uzyc tej funkcji nie martwiac sie o typ argumentu
 
 static SString &empty();