epics/pvData
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

minor cleanup in TypeFunc

Browse Source 
Switch TypeFunc and ScalarTypeFunc from completely static
classes to namespaces.  They functions share no private data
between them (and it seems unlikely that they ever will) so
there is no benefit to being class functions.

Also misc. cleanup of static string defs, and comparisons.
This commit is contained in:
Michael Davidsaver
2011-03-02 18:00:20 -05:00
parent fa77eacd4e
commit 14c1fdc8c1
2 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
pvDataApp/factory/TypeFunc.cpp
View File

@@ -10,51 +10,55 @@
#include <cstdio>
#include "pvIntrospect.h"
#include "epicsException.h"
namespace epics { namespace pvData {
void TypeFunc::toString(StringBuilder buf,const Type type) {
static String unknownString = "logic error unknown Type";
namespace TypeFunc {
void toString(StringBuilder buf,const Type type) {
static const String unknownString("logic error unknown Type");
switch(type) {
case scalar : *buf += "scalar"; break;
case scalarArray : *buf += "scalarArray"; break;
case structure : *buf += "structure"; break;
case structureArray : *buf += "structureArray"; break;
default:
throw std::invalid_argument(unknownString);
THROW_EXCEPTION2(std::invalid_argument, unknownString);
}
}
} // namespace TypeFunc
bool ScalarTypeFunc::isInteger(ScalarType type) {
namespace ScalarTypeFunc {
bool isInteger(ScalarType type) {
if(type>=pvByte && type<=pvLong) return true;
return false;
}
bool ScalarTypeFunc::isNumeric(ScalarType type) {
bool isNumeric(ScalarType type) {
if(type>=pvByte && type<=pvDouble) return true;
return false;
}
bool ScalarTypeFunc::isPrimitive(ScalarType type) {
bool isPrimitive(ScalarType type) {
if(type>=pvBoolean && type<=pvDouble) return true;
return false;
}
ScalarType ScalarTypeFunc::getScalarType(String pvalue) {
static String unknownString = "error unknown ScalarType";
if(pvalue.compare("boolean")==0) return pvBoolean;
if(pvalue.compare("byte")==0) return pvByte;
if(pvalue.compare("short")==0) return pvShort;
if(pvalue.compare("int")==0) return pvInt;
if(pvalue.compare("long")==0) return pvLong;
if(pvalue.compare("float")==0) return pvFloat;
if(pvalue.compare("double")==0) return pvDouble;
if(pvalue.compare("string")==0) return pvString;
throw std::invalid_argument(unknownString);
ScalarType getScalarType(String pvalue) {
static const String unknownString("error unknown ScalarType");
if(pvalue == "boolean") return pvBoolean;
if(pvalue == "byte") return pvByte;
if(pvalue == "short") return pvShort;
if(pvalue == "int") return pvInt;
if(pvalue == "long") return pvLong;
if(pvalue == "float") return pvFloat;
if(pvalue == "double") return pvDouble;
if(pvalue == "string") return pvString;
THROW_EXCEPTION2(std::invalid_argument, unknownString);
}
void ScalarTypeFunc::toString(StringBuilder buf,const ScalarType scalarType) {
static String unknownString = "logic error unknown ScalarType";
void toString(StringBuilder buf,const ScalarType scalarType) {
static const String unknownString("logic error unknown ScalarType");
switch(scalarType) {
case pvBoolean : *buf += "boolean"; return;
case pvByte : *buf += "byte"; return;;
@@ -65,8 +69,9 @@ namespace epics { namespace pvData {
case pvDouble : *buf += "double"; return;
case pvString : *buf += "string"; return;
}
throw std::invalid_argument(unknownString);
THROW_EXCEPTION2(std::invalid_argument, unknownString);
}
} // namespace ScalarTypeFunc
}}

18
pvDataApp/pv/pvIntrospect.h
View File

@@ -32,9 +32,8 @@ enum Type {
structureArray
};
class TypeFunc {
public:
static void toString(StringBuilder buf,const Type type);
namespace TypeFunc {
void toString(StringBuilder buf,const Type type);
};
enum ScalarType {
@@ -48,13 +47,12 @@ enum ScalarType {
pvString
};
class ScalarTypeFunc {
public:
static bool isInteger(ScalarType type);
static bool isNumeric(ScalarType type);
static bool isPrimitive(ScalarType type);
static ScalarType getScalarType(String value);
static void toString(StringBuilder buf,ScalarType scalarType);
namespace ScalarTypeFunc {
bool isInteger(ScalarType type);
bool isNumeric(ScalarType type);
bool isPrimitive(ScalarType type);
ScalarType getScalarType(String value);
void toString(StringBuilder buf,ScalarType scalarType);
};
class Field : private NoDefaultMethods {