clean up number scanner in Units
This commit is contained in:
jriegel
parent
1da5543657
commit
b32b227733
|
|
@ -239,7 +239,28 @@ Quantity Quantity::Gon (360.0/400.0 ,Unit(0,0,0,0,0,0,0,1)); // g
|
||||||
|
|
||||||
Quantity QuantResult;
|
Quantity QuantResult;
|
||||||
|
|
||||||
|
/* helper function for tuning number strings with groups in a locale agnostic way... */
|
||||||
|
double num_change(char* yytext,char dez_delim,char grp_delim)
|
||||||
|
{
|
||||||
|
double ret_val;
|
||||||
|
char temp[40];
|
||||||
|
int i = 0;
|
||||||
|
for(char* c=yytext;*c!='\0';c++){
|
||||||
|
// skipp group delimiter
|
||||||
|
if(*c==grp_delim) continue;
|
||||||
|
// check for a dez delimiter othere then dot
|
||||||
|
if(*c==dez_delim && dez_delim !='.')
|
||||||
|
temp[i++] = '.';
|
||||||
|
else
|
||||||
|
temp[i++] = *c;
|
||||||
|
// check buffor overflow
|
||||||
|
if (i>39) return 0.0;
|
||||||
|
}
|
||||||
|
temp[i] = '\0';
|
||||||
|
|
||||||
|
ret_val = atof( temp );
|
||||||
|
return ret_val;
|
||||||
|
};
|
||||||
|
|
||||||
// error func
|
// error func
|
||||||
void Quantity_yyerror(char *errorinfo)
|
void Quantity_yyerror(char *errorinfo)
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -22,6 +22,9 @@
|
||||||
|
|
||||||
DIGIT [0-9]
|
DIGIT [0-9]
|
||||||
ID [a-z][a-z0-9]*
|
ID [a-z][a-z0-9]*
|
||||||
|
EXPO [eE][-+]?[0-9]+
|
||||||
|
DGRP '\.'[0-9][0-9][0-9]
|
||||||
|
CGRP '\,'[0-9][0-9][0-9]
|
||||||
|
|
||||||
%x C_COMMENT
|
%x C_COMMENT
|
||||||
|
|
||||||
|
|
@ -37,100 +40,98 @@ ID [a-z][a-z0-9]*
|
||||||
|
|
||||||
[+()=/*^] { return *yytext; }
|
[+()=/*^] { return *yytext; }
|
||||||
|
|
||||||
"-" return MINUSSIGN;
|
"-" return MINUSSIGN;
|
||||||
"\xe2\x88\x92" return MINUSSIGN;
|
"\xe2\x88\x92" return MINUSSIGN;
|
||||||
|
|
||||||
"nm" yylval = Quantity::NanoMetre; return UNIT; // nano meter
|
|
||||||
"um" yylval = Quantity::MicroMetre; return UNIT; // micro meter
|
|
||||||
"\xC2\xB5m" yylval = Quantity::MicroMetre; return UNIT; // micro meter (greek micro in UTF8)
|
|
||||||
"mm" yylval = Quantity::MilliMetre; return UNIT; // milli meter (internal standard length)
|
|
||||||
"cm" yylval = Quantity::CentiMetre; return UNIT; // centi meter
|
|
||||||
"dm" yylval = Quantity::DeciMetre; return UNIT; // deci meter
|
|
||||||
"m" yylval = Quantity::Metre; return UNIT; // metre
|
|
||||||
"km" yylval = Quantity::KiloMetre; return UNIT; // kilo meter
|
|
||||||
|
|
||||||
"l" yylval = Quantity::Liter; return UNIT; // Liter dm^3
|
|
||||||
|
|
||||||
"ug" yylval = Quantity::MicroGram; return UNIT; // micro gram
|
|
||||||
"\xC2\xB5g" yylval = Quantity::MicroGram; return UNIT; // micro gram
|
|
||||||
"mg" yylval = Quantity::MilliGram; return UNIT; // milli gram
|
|
||||||
"g" yylval = Quantity::Gram; return UNIT; // gram
|
|
||||||
"kg" yylval = Quantity::KiloGram; return UNIT; // kilo gram (internal standard for mass)
|
|
||||||
"t" yylval = Quantity::Ton; return UNIT; // Metric Tonne
|
|
||||||
|
|
||||||
"s" yylval = Quantity::Second; return UNIT; // second (internal standard time)
|
|
||||||
"min" yylval = Quantity::Minute; return UNIT; // minute
|
|
||||||
"h" yylval = Quantity::Hour; return UNIT; // hour
|
|
||||||
|
|
||||||
"A" yylval = Quantity::Ampere; return UNIT; // Ampere (internal standard electric current)
|
|
||||||
"mA" yylval = Quantity::MilliAmpere; return UNIT; // milli Ampere
|
|
||||||
"kA" yylval = Quantity::KiloAmpere; return UNIT; // kilo Ampere
|
|
||||||
"MA" yylval = Quantity::MegaAmpere; return UNIT; // Mega Ampere
|
|
||||||
|
|
||||||
"K" yylval = Quantity::Kelvin; return UNIT; // Kelvin (internal standard thermodynamic temperature)
|
|
||||||
"mK" yylval = Quantity::MilliKelvin; return UNIT; // Kelvin
|
|
||||||
"\xC2\xB5K" yylval = Quantity::MicroKelvin; return UNIT; // Kelvin
|
|
||||||
"uK" yylval = Quantity::MicroKelvin; return UNIT; // Kelvin
|
|
||||||
|
|
||||||
"mol" yylval = Quantity::Mole; return UNIT; // Mole (internal standard amount of substance)
|
|
||||||
|
|
||||||
"cd" yylval = Quantity::Candela; return UNIT; // Candela (internal standard luminous intensity)
|
|
||||||
|
|
||||||
"in" yylval = Quantity::Inch; return UNIT; // inch
|
|
||||||
"\"" yylval = Quantity::Inch; return UNIT; // inch
|
|
||||||
"ft" yylval = Quantity::Foot; return UNIT; // foot
|
|
||||||
"'" yylval = Quantity::Foot; return UNIT; // foot
|
|
||||||
"thou" yylval = Quantity::Thou; return UNIT; // thou (in/1000)
|
|
||||||
"mil" yylval = Quantity::Thou; return UNIT; // mil (the thou in US)
|
|
||||||
"yd" yylval = Quantity::Yard; return UNIT; // yard
|
|
||||||
"mi" yylval = Quantity::Mile; return UNIT; // mile
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
"lb" yylval = Quantity::Pound; return UNIT; // pound
|
|
||||||
"lbm" yylval = Quantity::Pound; return UNIT; // pound
|
|
||||||
"oz" yylval = Quantity::Ounce; return UNIT; // ounce
|
|
||||||
"st" yylval = Quantity::Stone; return UNIT; // Stone
|
|
||||||
"cwt" yylval = Quantity::Hundredweights; return UNIT; // hundredweights
|
|
||||||
|
|
||||||
"lbf" yylval = Quantity::PoundForce; return UNIT; // pound
|
|
||||||
|
|
||||||
"N" yylval = Quantity::Newton; return UNIT; // Newton (kg*m/s^2)
|
|
||||||
"kN" yylval = Quantity::KiloNewton; return UNIT; // Newton
|
|
||||||
"MN" yylval = Quantity::MegaNewton; return UNIT; // Newton
|
|
||||||
"mN" yylval = Quantity::MilliNewton; return UNIT; // Newton
|
|
||||||
|
|
||||||
"Pa" yylval = Quantity::Pascal; return UNIT; // Pascal (kg/m*s^2 or N/m^2)
|
|
||||||
"kPa" yylval = Quantity::KiloPascal; return UNIT; // Pascal
|
|
||||||
"MPa" yylval = Quantity::MegaPascal; return UNIT; // Pascal
|
|
||||||
"GPa" yylval = Quantity::GigaPascal; return UNIT; // Pascal
|
|
||||||
|
|
||||||
"Torr" yylval = Quantity::Torr; return UNIT; // portion of Pascal ( 101325/760 )
|
"nm" yylval = Quantity::NanoMetre; return UNIT; // nano meter
|
||||||
"mTorr" yylval = Quantity::mTorr; return UNIT; //
|
"um" yylval = Quantity::MicroMetre; return UNIT; // micro meter
|
||||||
"uTorr" yylval = Quantity::yTorr; return UNIT; //
|
"\xC2\xB5m" yylval = Quantity::MicroMetre; return UNIT; // micro meter (greek micro in UTF8)
|
||||||
"\xC2\xB5Torr" yylval = Quantity::yTorr; return UNIT; //
|
"mm" yylval = Quantity::MilliMetre; return UNIT; // milli meter (internal standard length)
|
||||||
|
"cm" yylval = Quantity::CentiMetre; return UNIT; // centi meter
|
||||||
"psi" yylval = Quantity::PSI; return UNIT; // pounds/in^2
|
"dm" yylval = Quantity::DeciMetre; return UNIT; // deci meter
|
||||||
"ksi" yylval = Quantity::KSI; return UNIT; // 1000 x pounds/in^2
|
"m" yylval = Quantity::Metre; return UNIT; // metre
|
||||||
|
"km" yylval = Quantity::KiloMetre; return UNIT; // kilo meter
|
||||||
"W" yylval = Quantity::Watt; return UNIT; // Watt (kg*m^2/s^3)
|
|
||||||
"VA" yylval = Quantity::VoltAmpere; return UNIT; // VoltAmpere (kg*m^2/s^3)
|
"l" yylval = Quantity::Liter; return UNIT; // Liter dm^3
|
||||||
|
|
||||||
"J" yylval = Quantity::Joule; return UNIT; // Joule (kg*m^2/s^2)
|
"ug" yylval = Quantity::MicroGram; return UNIT; // micro gram
|
||||||
"Nm" yylval = Quantity::NewtonMeter; return UNIT; // N*m = Joule
|
"\xC2\xB5g" yylval = Quantity::MicroGram; return UNIT; // micro gram
|
||||||
"VAs" yylval = Quantity::VoltAmpereSecond; return UNIT; // V*A*s = Joule
|
"mg" yylval = Quantity::MilliGram; return UNIT; // milli gram
|
||||||
"CV" yylval = Quantity::WattSecond; return UNIT; //
|
"g" yylval = Quantity::Gram; return UNIT; // gram
|
||||||
"Ws" yylval = Quantity::WattSecond; return UNIT; // W*s = Joule
|
"kg" yylval = Quantity::KiloGram; return UNIT; // kilo gram (internal standard for mass)
|
||||||
|
"t" yylval = Quantity::Ton; return UNIT; // Metric Tonne
|
||||||
"\xC2\xB0" yylval = Quantity::Degree; return UNIT; // degree (internal standard angle)
|
|
||||||
"deg" yylval = Quantity::Degree; return UNIT; // degree (internal standard angle)
|
"s" yylval = Quantity::Second; return UNIT; // second (internal standard time)
|
||||||
"rad" yylval = Quantity::Radian; return UNIT; // radian
|
"min" yylval = Quantity::Minute; return UNIT; // minute
|
||||||
"gon" yylval = Quantity::Gon; return UNIT; // gon
|
"h" yylval = Quantity::Hour; return UNIT; // hour
|
||||||
|
|
||||||
|
"A" yylval = Quantity::Ampere; return UNIT; // Ampere (internal standard electric current)
|
||||||
|
"mA" yylval = Quantity::MilliAmpere; return UNIT; // milli Ampere
|
||||||
|
"kA" yylval = Quantity::KiloAmpere; return UNIT; // kilo Ampere
|
||||||
|
"MA" yylval = Quantity::MegaAmpere; return UNIT; // Mega Ampere
|
||||||
|
|
||||||
|
"K" yylval = Quantity::Kelvin; return UNIT; // Kelvin (internal standard thermodynamic temperature)
|
||||||
|
"mK" yylval = Quantity::MilliKelvin; return UNIT; // Kelvin
|
||||||
|
"\xC2\xB5K" yylval = Quantity::MicroKelvin; return UNIT; // Kelvin
|
||||||
|
"uK" yylval = Quantity::MicroKelvin; return UNIT; // Kelvin
|
||||||
|
|
||||||
|
"mol" yylval = Quantity::Mole; return UNIT; // Mole (internal standard amount of substance)
|
||||||
|
|
||||||
|
"cd" yylval = Quantity::Candela; return UNIT; // Candela (internal standard luminous intensity)
|
||||||
|
|
||||||
|
"in" yylval = Quantity::Inch; return UNIT; // inch
|
||||||
|
"\"" yylval = Quantity::Inch; return UNIT; // inch
|
||||||
|
"ft" yylval = Quantity::Foot; return UNIT; // foot
|
||||||
|
"'" yylval = Quantity::Foot; return UNIT; // foot
|
||||||
|
"thou" yylval = Quantity::Thou; return UNIT; // thou (in/1000)
|
||||||
|
"mil" yylval = Quantity::Thou; return UNIT; // mil (the thou in US)
|
||||||
|
"yd" yylval = Quantity::Yard; return UNIT; // yard
|
||||||
|
"mi" yylval = Quantity::Mile; return UNIT; // mile
|
||||||
|
|
||||||
|
|
||||||
{DIGIT}*["."","]{DIGIT}*[eE][-+]?[0-9]+ { for(char* c=yytext;*c!='\0';c++) if(*c==',') *c='.'; yylval = atof( yytext ); return NUM; }
|
|
||||||
{DIGIT}*["."","]{DIGIT}* { for(char* c=yytext;*c!='\0';c++)if(*c==',')*c='.'; yylval = atof( yytext ); return NUM; }
|
"lb" yylval = Quantity::Pound; return UNIT; // pound
|
||||||
{DIGIT}+ { yylval = atof( yytext ); return NUM;}
|
"lbm" yylval = Quantity::Pound; return UNIT; // pound
|
||||||
|
"oz" yylval = Quantity::Ounce; return UNIT; // ounce
|
||||||
|
"st" yylval = Quantity::Stone; return UNIT; // Stone
|
||||||
|
"cwt" yylval = Quantity::Hundredweights; return UNIT; // hundredweights
|
||||||
|
|
||||||
|
"lbf" yylval = Quantity::PoundForce; return UNIT; // pound
|
||||||
|
|
||||||
|
"N" yylval = Quantity::Newton; return UNIT; // Newton (kg*m/s^2)
|
||||||
|
"kN" yylval = Quantity::KiloNewton; return UNIT; // Newton
|
||||||
|
"MN" yylval = Quantity::MegaNewton; return UNIT; // Newton
|
||||||
|
"mN" yylval = Quantity::MilliNewton; return UNIT; // Newton
|
||||||
|
|
||||||
|
"Pa" yylval = Quantity::Pascal; return UNIT; // Pascal (kg/m*s^2 or N/m^2)
|
||||||
|
"kPa" yylval = Quantity::KiloPascal; return UNIT; // Pascal
|
||||||
|
"MPa" yylval = Quantity::MegaPascal; return UNIT; // Pascal
|
||||||
|
"GPa" yylval = Quantity::GigaPascal; return UNIT; // Pascal
|
||||||
|
|
||||||
|
"Torr" yylval = Quantity::Torr; return UNIT; // portion of Pascal ( 101325/760 )
|
||||||
|
"mTorr" yylval = Quantity::mTorr; return UNIT; //
|
||||||
|
"uTorr" yylval = Quantity::yTorr; return UNIT; //
|
||||||
|
"\xC2\xB5Torr" yylval = Quantity::yTorr; return UNIT; //
|
||||||
|
|
||||||
|
"psi" yylval = Quantity::PSI; return UNIT; // pounds/in^2
|
||||||
|
"ksi" yylval = Quantity::KSI; return UNIT; // 1000 x pounds/in^2
|
||||||
|
|
||||||
|
"W" yylval = Quantity::Watt; return UNIT; // Watt (kg*m^2/s^3)
|
||||||
|
"VA" yylval = Quantity::VoltAmpere; return UNIT; // VoltAmpere (kg*m^2/s^3)
|
||||||
|
|
||||||
|
"J" yylval = Quantity::Joule; return UNIT; // Joule (kg*m^2/s^2)
|
||||||
|
"Nm" yylval = Quantity::NewtonMeter; return UNIT; // N*m = Joule
|
||||||
|
"VAs" yylval = Quantity::VoltAmpereSecond; return UNIT; // V*A*s = Joule
|
||||||
|
"CV" yylval = Quantity::WattSecond; return UNIT; //
|
||||||
|
"Ws" yylval = Quantity::WattSecond; return UNIT; // W*s = Joule
|
||||||
|
|
||||||
|
"\xC2\xB0" yylval = Quantity::Degree; return UNIT; // degree (internal standard angle)
|
||||||
|
"deg" yylval = Quantity::Degree; return UNIT; // degree (internal standard angle)
|
||||||
|
"rad" yylval = Quantity::Radian; return UNIT; // radian
|
||||||
|
"gon" yylval = Quantity::Gon; return UNIT; // gon
|
||||||
|
|
||||||
|
{DIGIT}+"."?{DIGIT}*{EXPO}? { yylval = num_change(yytext,'.',',');return NUM; }
|
||||||
|
{DIGIT}+","?{DIGIT}*{EXPO}? { yylval = num_change(yytext,',','.');return NUM; }
|
||||||
|
|
||||||
|
|
||||||
"pi" {yylval = M_PI ; return NUM;} // constant pi
|
"pi" {yylval = M_PI ; return NUM;} // constant pi
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user