diff --git a/src/App/FreeCADInit.py b/src/App/FreeCADInit.py index 315e036b02..952f2e702b 100644 --- a/src/App/FreeCADInit.py +++ b/src/App/FreeCADInit.py @@ -136,13 +136,13 @@ FreeCAD.EndingAdd("FreeCAD document (*.FCStd)","FreeCAD") App.GuiUp = 0 # fill up unit definitions -App.Units.NanoMeter = App.Units.Quantity('nm') -App.Units.MicroMeter = App.Units.Quantity('ym') -App.Units.MilliMeter = App.Units.Quantity('mm') -App.Units.CentiMeter = App.Units.Quantity('cm') -App.Units.DeciMeter = App.Units.Quantity('dm') -App.Units.Meter = App.Units.Quantity('m') -App.Units.KiloMeter = App.Units.Quantity('km') +App.Units.NanoMetre = App.Units.Quantity('nm') +App.Units.MicroMetre = App.Units.Quantity('ym') +App.Units.MilliMetre = App.Units.Quantity('mm') +App.Units.CentiMetre = App.Units.Quantity('cm') +App.Units.DeciMetre = App.Units.Quantity('dm') +App.Units.Metre = App.Units.Quantity('m') +App.Units.KiloMetre = App.Units.Quantity('km') App.Units.Liter = App.Units.Quantity('l') @@ -153,7 +153,7 @@ App.Units.KiloGram = App.Units.Quantity('kg') App.Units.Ton = App.Units.Quantity('t') App.Units.Second = App.Units.Quantity('s') -App.Units.Minut = App.Units.Quantity('min') +App.Units.Minute = App.Units.Quantity('min') App.Units.Hour = App.Units.Quantity('h') App.Units.Ampere = App.Units.Quantity('A') diff --git a/src/Base/Quantity.cpp b/src/Base/Quantity.cpp index cbc3323a8a..92071d12de 100644 --- a/src/Base/Quantity.cpp +++ b/src/Base/Quantity.cpp @@ -146,13 +146,13 @@ void Quantity::setInvalid(void) // === Predefined types ===================================================== -Quantity Quantity::NanoMeter (1.0e-6 ,Unit(1)); -Quantity Quantity::MicroMeter (1.0e-3 ,Unit(1)); -Quantity Quantity::MilliMeter (1.0 ,Unit(1)); -Quantity Quantity::CentiMeter (10.0 ,Unit(1)); -Quantity Quantity::DeciMeter (100.0 ,Unit(1)); -Quantity Quantity::Meter (1.0e3 ,Unit(1)); -Quantity Quantity::KiloMeter (1.0e6 ,Unit(1)); +Quantity Quantity::NanoMetre (1.0e-6 ,Unit(1)); +Quantity Quantity::MicroMetre (1.0e-3 ,Unit(1)); +Quantity Quantity::MilliMetre (1.0 ,Unit(1)); +Quantity Quantity::CentiMetre (10.0 ,Unit(1)); +Quantity Quantity::DeciMetre (100.0 ,Unit(1)); +Quantity Quantity::Metre (1.0e3 ,Unit(1)); +Quantity Quantity::KiloMetre (1.0e6 ,Unit(1)); Quantity Quantity::Liter (1000000.0 ,Unit(3)); diff --git a/src/Base/Quantity.h b/src/Base/Quantity.h index 86454c5205..eea35946a3 100644 --- a/src/Base/Quantity.h +++ b/src/Base/Quantity.h @@ -85,13 +85,13 @@ public: /** Predefined Unit types. */ //@{ - static Quantity NanoMeter; - static Quantity MicroMeter; - static Quantity CentiMeter; - static Quantity DeciMeter; - static Quantity Meter; - static Quantity MilliMeter; - static Quantity KiloMeter; + static Quantity NanoMetre; + static Quantity MicroMetre; + static Quantity CentiMetre; + static Quantity DeciMetre; + static Quantity Metre; + static Quantity MilliMetre; + static Quantity KiloMetre; static Quantity Liter; diff --git a/src/Base/QuantityLexer.c b/src/Base/QuantityLexer.c index c5b93964d6..e057825a12 100644 --- a/src/Base/QuantityLexer.c +++ b/src/Base/QuantityLexer.c @@ -370,7 +370,7 @@ struct yy_trans_info flex_int32_t yy_verify; flex_int32_t yy_nxt; }; -static yyconst flex_int16_t yy_accept[138] = +static yyconst flex_int16_t yy_accept[136] = { 0, 0, 0, 0, 0, 84, 83, 4, 5, 33, 35, 6, 64, 23, 83, 83, 54, 27, 83, 43, 83, @@ -380,13 +380,13 @@ static yyconst flex_int16_t yy_accept[138] = 0, 55, 47, 53, 58, 0, 0, 0, 0, 31, 10, 0, 0, 0, 11, 0, 34, 0, 32, 25, 44, 0, 18, 13, 39, 0, 24, 28, 46, 16, - 0, 9, 0, 7, 40, 65, 0, 0, 0, 0, + 38, 9, 0, 7, 40, 65, 0, 0, 0, 0, 0, 41, 0, 36, 29, 15, 8, 37, 63, 0, 50, 49, 56, 73, 0, 0, 0, 71, 42, 59, - 72, 61, 48, 75, 0, 21, 74, 30, 77, 51, - 60, 78, 0, 80, 0, 62, 67, 68, 69, 0, - 38, 79, 82, 81, 70, 76, 0 + 72, 61, 48, 75, 21, 74, 30, 77, 51, 60, + 78, 0, 80, 0, 62, 67, 68, 69, 0, 79, + 82, 81, 70, 76, 0 } ; static yyconst flex_int32_t yy_ec[256] = @@ -430,45 +430,45 @@ static yyconst flex_int32_t yy_meta[49] = 1, 1, 1, 1, 1, 1, 1, 1 } ; -static yyconst flex_int16_t yy_base[139] = +static yyconst flex_int16_t yy_base[137] = { 0, - 0, 0, 46, 47, 179, 180, 180, 175, 180, 180, - 180, 47, 180, 155, 155, 180, 180, 40, 138, 148, - 160, 129, 180, 35, 36, 37, 125, 131, 130, 180, - 130, 56, 25, 67, 130, 118, 52, 139, 48, 57, - 66, 180, 180, 161, 100, 109, 180, 137, 180, 180, - 136, 180, 180, 118, 180, 117, 120, 124, 131, 180, - 180, 113, 111, 122, 180, 113, 180, 114, 180, 180, - 180, 125, 180, 180, 180, 118, 180, 180, 180, 180, - 30, 180, 71, 180, 180, 180, 104, 114, 118, 108, - 103, 180, 106, 180, 180, 180, 180, 180, 113, 122, + 0, 0, 46, 47, 177, 178, 178, 173, 178, 178, + 178, 47, 178, 153, 153, 178, 178, 40, 136, 146, + 158, 127, 178, 35, 36, 37, 123, 129, 128, 178, + 128, 56, 25, 67, 128, 116, 52, 137, 48, 57, + 66, 178, 178, 159, 100, 109, 178, 135, 178, 178, + 134, 178, 178, 116, 178, 115, 118, 122, 129, 178, + 178, 111, 109, 120, 178, 111, 178, 112, 178, 178, + 178, 123, 178, 178, 178, 116, 178, 178, 178, 178, + 109, 178, 71, 178, 178, 178, 101, 111, 115, 89, + 84, 178, 78, 178, 178, 178, 178, 178, 113, 122, - 180, 180, 180, 180, 84, 88, 78, 180, 180, 180, - 180, 180, 180, 104, 75, 180, 180, 180, 180, 180, - 180, 69, 53, 63, 126, 130, 180, 180, 83, 61, - 180, 180, 180, 180, 180, 180, 180, 53 + 178, 178, 178, 178, 71, 67, 64, 178, 178, 178, + 178, 178, 178, 87, 178, 178, 178, 178, 178, 178, + 63, 50, 37, 126, 130, 178, 178, 57, 57, 178, + 178, 178, 178, 178, 178, 53 } ; -static yyconst flex_int16_t yy_def[139] = +static yyconst flex_int16_t yy_def[137] = { 0, - 137, 1, 138, 138, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 135, 1, 136, 136, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 0, 137 + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 0, 135 } ; -static yyconst flex_int16_t yy_nxt[229] = +static yyconst flex_int16_t yy_nxt[227] = { 0, 6, 7, 8, 9, 10, 11, 11, 6, 12, 12, 12, 12, 13, 14, 6, 15, 16, 17, 18, 19, @@ -476,54 +476,54 @@ static yyconst flex_int16_t yy_nxt[229] = 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 6, 38, 39, 40, 6, 6, 41, 6, 6, 6, 45, 75, 49, 42, 45, 46, 46, 46, 46, 50, - 51, 56, 57, 76, 60, 115, 64, 116, 70, 136, + 51, 56, 57, 76, 60, 134, 64, 133, 70, 132, 43, 43, 61, 65, 62, 71, 72, 58, 59, 77, 63, 90, 93, 95, 78, 86, 79, 73, 91, 94, - 87, 92, 74, 135, 88, 134, 133, 96, 80, 117, + 87, 92, 74, 131, 88, 130, 129, 96, 80, 116, - 81, 132, 97, 82, 131, 83, 118, 98, 99, 99, - 99, 99, 45, 130, 100, 129, 45, 46, 46, 46, - 46, 99, 99, 99, 99, 128, 127, 100, 125, 100, - 126, 126, 126, 126, 126, 126, 126, 126, 126, 126, - 126, 126, 100, 124, 123, 122, 121, 120, 119, 114, - 113, 112, 111, 110, 109, 108, 107, 106, 105, 104, - 103, 102, 101, 44, 89, 85, 84, 69, 68, 67, - 66, 55, 54, 53, 52, 48, 47, 44, 137, 5, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 81, 128, 97, 82, 127, 83, 117, 98, 99, 99, + 99, 99, 45, 126, 100, 123, 45, 46, 46, 46, + 46, 99, 99, 99, 99, 122, 121, 100, 124, 100, + 125, 125, 125, 125, 125, 125, 125, 125, 125, 125, + 125, 125, 100, 120, 119, 118, 115, 114, 113, 112, + 111, 110, 109, 108, 107, 106, 105, 104, 103, 102, + 101, 44, 89, 85, 84, 69, 68, 67, 66, 55, + 54, 53, 52, 48, 47, 44, 135, 5, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137 + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135 } ; -static yyconst flex_int16_t yy_chk[229] = +static yyconst flex_int16_t yy_chk[227] = { 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 3, 4, - 12, 33, 18, 138, 12, 12, 12, 12, 12, 18, - 18, 24, 24, 33, 25, 81, 26, 81, 32, 130, + 12, 33, 18, 136, 12, 12, 12, 12, 12, 18, + 18, 24, 24, 33, 25, 129, 26, 128, 32, 123, 3, 4, 25, 26, 25, 32, 32, 24, 24, 34, 25, 39, 40, 41, 34, 37, 34, 32, 39, 40, - 37, 39, 32, 129, 37, 124, 123, 41, 34, 83, + 37, 39, 32, 122, 37, 121, 114, 41, 34, 83, - 34, 122, 41, 34, 115, 34, 83, 41, 45, 45, - 45, 45, 46, 114, 45, 107, 46, 46, 46, 46, - 46, 99, 99, 99, 99, 106, 105, 99, 100, 45, - 100, 100, 100, 100, 125, 125, 125, 125, 126, 126, - 126, 126, 99, 93, 91, 90, 89, 88, 87, 76, - 72, 68, 66, 64, 63, 62, 59, 58, 57, 56, - 54, 51, 48, 44, 38, 36, 35, 31, 29, 28, - 27, 22, 21, 20, 19, 15, 14, 8, 5, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, + 34, 107, 41, 34, 106, 34, 83, 41, 45, 45, + 45, 45, 46, 105, 45, 93, 46, 46, 46, 46, + 46, 99, 99, 99, 99, 91, 90, 99, 100, 45, + 100, 100, 100, 100, 124, 124, 124, 124, 125, 125, + 125, 125, 99, 89, 88, 87, 81, 76, 72, 68, + 66, 64, 63, 62, 59, 58, 57, 56, 54, 51, + 48, 44, 38, 36, 35, 31, 29, 28, 27, 22, + 21, 20, 19, 15, 14, 8, 5, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137, 137, 137, - 137, 137, 137, 137, 137, 137, 137, 137 + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135, 135, 135, 135, 135, + 135, 135, 135, 135, 135, 135 } ; static yy_state_type yy_last_accepting_state; @@ -791,13 +791,13 @@ yy_match: while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 138 ) + if ( yy_current_state >= 136 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; ++yy_cp; } - while ( yy_current_state != 137 ); + while ( yy_current_state != 135 ); yy_cp = (yy_last_accepting_cpos); yy_current_state = (yy_last_accepting_state); @@ -851,37 +851,37 @@ YY_RULE_SETUP case 7: YY_RULE_SETUP #line 40 "QuantityParser.l" -yylval = Quantity::NanoMeter; return UNIT; // nano meter +yylval = Quantity::NanoMetre; return UNIT; // nano meter YY_BREAK case 8: YY_RULE_SETUP #line 41 "QuantityParser.l" -yylval = Quantity::MicroMeter; return UNIT; // micro meter +yylval = Quantity::MicroMetre; return UNIT; // micro meter YY_BREAK case 9: YY_RULE_SETUP #line 42 "QuantityParser.l" -yylval = Quantity::MilliMeter; return UNIT; // milli meter (internal standard length) +yylval = Quantity::MilliMetre; return UNIT; // milli meter (internal standard length) YY_BREAK case 10: YY_RULE_SETUP #line 43 "QuantityParser.l" -yylval = Quantity::CentiMeter; return UNIT; // centi meter +yylval = Quantity::CentiMetre; return UNIT; // centi meter YY_BREAK case 11: YY_RULE_SETUP #line 44 "QuantityParser.l" -yylval = Quantity::DeciMeter; return UNIT; // deci meter +yylval = Quantity::DeciMetre; return UNIT; // deci meter YY_BREAK case 12: YY_RULE_SETUP #line 45 "QuantityParser.l" -yylval = Quantity::Meter; return UNIT; // meter +yylval = Quantity::Metre; return UNIT; // metre YY_BREAK case 13: YY_RULE_SETUP #line 46 "QuantityParser.l" -yylval = Quantity::KiloMeter; return UNIT; // kilo meter +yylval = Quantity::KiloMetre; return UNIT; // kilo meter YY_BREAK case 14: YY_RULE_SETUP @@ -911,7 +911,7 @@ yylval = Quantity::KiloGram; return UNIT; // kilo gram (internal case 19: YY_RULE_SETUP #line 54 "QuantityParser.l" -yylval = Quantity::Ton; return UNIT; // ton +yylval = Quantity::Ton; return UNIT; // Metric Tonne YY_BREAK case 20: YY_RULE_SETUP @@ -1010,227 +1010,227 @@ yylval = Quantity::Mile; return UNIT; // mile YY_BREAK case 39: YY_RULE_SETUP -#line 82 "QuantityParser.l" +#line 83 "QuantityParser.l" yylval = Quantity::Pound; return UNIT; // pound YY_BREAK case 40: YY_RULE_SETUP -#line 83 "QuantityParser.l" +#line 84 "QuantityParser.l" yylval = Quantity::Ounce; return UNIT; // ounce YY_BREAK case 41: YY_RULE_SETUP -#line 84 "QuantityParser.l" +#line 85 "QuantityParser.l" yylval = Quantity::Stone; return UNIT; // Stone YY_BREAK case 42: YY_RULE_SETUP -#line 85 "QuantityParser.l" +#line 86 "QuantityParser.l" yylval = Quantity::Hundredweights; return UNIT; // hundredweights YY_BREAK case 43: YY_RULE_SETUP -#line 87 "QuantityParser.l" +#line 88 "QuantityParser.l" yylval = Quantity::Newton; return UNIT; // Newton (kg*m/s^2) YY_BREAK case 44: YY_RULE_SETUP -#line 88 "QuantityParser.l" +#line 89 "QuantityParser.l" yylval = Quantity::KiloNewton; return UNIT; // Newton YY_BREAK case 45: YY_RULE_SETUP -#line 89 "QuantityParser.l" +#line 90 "QuantityParser.l" yylval = Quantity::MegaNewton; return UNIT; // Newton YY_BREAK case 46: YY_RULE_SETUP -#line 90 "QuantityParser.l" +#line 91 "QuantityParser.l" yylval = Quantity::MilliNewton; return UNIT; // Newton YY_BREAK case 47: YY_RULE_SETUP -#line 92 "QuantityParser.l" +#line 93 "QuantityParser.l" yylval = Quantity::Pascal; return UNIT; // Pascal (kg/m*s^2 or N/m^2) YY_BREAK case 48: YY_RULE_SETUP -#line 93 "QuantityParser.l" +#line 94 "QuantityParser.l" yylval = Quantity::KiloPascal; return UNIT; // Pascal YY_BREAK case 49: YY_RULE_SETUP -#line 94 "QuantityParser.l" +#line 95 "QuantityParser.l" yylval = Quantity::MegaPascal; return UNIT; // Pascal YY_BREAK case 50: YY_RULE_SETUP -#line 95 "QuantityParser.l" +#line 96 "QuantityParser.l" yylval = Quantity::GigaPascal; return UNIT; // Pascal YY_BREAK case 51: YY_RULE_SETUP -#line 97 "QuantityParser.l" +#line 98 "QuantityParser.l" yylval = Quantity::PSI; return UNIT; // pounds/in^2 YY_BREAK case 52: YY_RULE_SETUP -#line 99 "QuantityParser.l" +#line 100 "QuantityParser.l" yylval = Quantity::Watt; return UNIT; // Watt (kg*m^2/s^3) YY_BREAK case 53: YY_RULE_SETUP -#line 100 "QuantityParser.l" +#line 101 "QuantityParser.l" yylval = Quantity::VoltAmpere; return UNIT; // VoltAmpere (kg*m^2/s^3) YY_BREAK case 54: YY_RULE_SETUP -#line 102 "QuantityParser.l" +#line 103 "QuantityParser.l" yylval = Quantity::Joul; return UNIT; // Joule (kg*m^2/s^2) YY_BREAK case 55: YY_RULE_SETUP -#line 103 "QuantityParser.l" +#line 104 "QuantityParser.l" yylval = Quantity::NewtonMeter; return UNIT; // Joule (kg*m^2/s^2) YY_BREAK case 56: YY_RULE_SETUP -#line 104 "QuantityParser.l" +#line 105 "QuantityParser.l" yylval = Quantity::VoltAmpereSecond; return UNIT; // Joule (kg*m^2/s^2) YY_BREAK case 57: YY_RULE_SETUP -#line 105 "QuantityParser.l" +#line 106 "QuantityParser.l" yylval = Quantity::WattSecond; return UNIT; // Joule (kg*m^2/s^2) YY_BREAK case 58: YY_RULE_SETUP -#line 106 "QuantityParser.l" +#line 107 "QuantityParser.l" yylval = Quantity::WattSecond; return UNIT; // Joule (kg*m^2/s^2) YY_BREAK case 59: YY_RULE_SETUP -#line 108 "QuantityParser.l" +#line 109 "QuantityParser.l" yylval = Quantity::Degree; return UNIT; // degree (internal standard angle) YY_BREAK case 60: YY_RULE_SETUP -#line 109 "QuantityParser.l" +#line 110 "QuantityParser.l" yylval = Quantity::Radian; return UNIT; // radian YY_BREAK case 61: YY_RULE_SETUP -#line 110 "QuantityParser.l" +#line 111 "QuantityParser.l" yylval = Quantity::Gon; return UNIT; // gon YY_BREAK case 62: YY_RULE_SETUP -#line 112 "QuantityParser.l" +#line 113 "QuantityParser.l" {for(char* c=yytext;*c!='\0';c++)if(*c==',')*c='.'; yylval = atof( yytext ); return NUM;} YY_BREAK case 63: YY_RULE_SETUP -#line 113 "QuantityParser.l" +#line 114 "QuantityParser.l" {for(char* c=yytext;*c!='\0';c++)if(*c==',')*c='.'; yylval = atof( yytext ); return NUM;} YY_BREAK case 64: YY_RULE_SETUP -#line 114 "QuantityParser.l" +#line 115 "QuantityParser.l" {yylval = atof( yytext ); return NUM;} YY_BREAK case 65: YY_RULE_SETUP -#line 116 "QuantityParser.l" +#line 117 "QuantityParser.l" {yylval = M_PI ; return NUM;} // constant pi YY_BREAK case 66: YY_RULE_SETUP -#line 117 "QuantityParser.l" +#line 118 "QuantityParser.l" {yylval = M_E ; return NUM;} // constant e YY_BREAK case 67: YY_RULE_SETUP -#line 119 "QuantityParser.l" +#line 120 "QuantityParser.l" return ACOS; YY_BREAK case 68: YY_RULE_SETUP -#line 120 "QuantityParser.l" +#line 121 "QuantityParser.l" return ASIN; YY_BREAK case 69: YY_RULE_SETUP -#line 121 "QuantityParser.l" +#line 122 "QuantityParser.l" return ATAN; YY_BREAK case 70: YY_RULE_SETUP -#line 122 "QuantityParser.l" +#line 123 "QuantityParser.l" return ATAN2; YY_BREAK case 71: YY_RULE_SETUP -#line 123 "QuantityParser.l" +#line 124 "QuantityParser.l" return COS; YY_BREAK case 72: YY_RULE_SETUP -#line 124 "QuantityParser.l" +#line 125 "QuantityParser.l" return EXP; YY_BREAK case 73: YY_RULE_SETUP -#line 125 "QuantityParser.l" +#line 126 "QuantityParser.l" return ABS; YY_BREAK case 74: YY_RULE_SETUP -#line 126 "QuantityParser.l" +#line 127 "QuantityParser.l" return MOD; YY_BREAK case 75: YY_RULE_SETUP -#line 127 "QuantityParser.l" +#line 128 "QuantityParser.l" return LOG; YY_BREAK case 76: YY_RULE_SETUP -#line 128 "QuantityParser.l" +#line 129 "QuantityParser.l" return LOG10; YY_BREAK case 77: YY_RULE_SETUP -#line 129 "QuantityParser.l" +#line 130 "QuantityParser.l" return POW; YY_BREAK case 78: YY_RULE_SETUP -#line 130 "QuantityParser.l" +#line 131 "QuantityParser.l" return SIN; YY_BREAK case 79: YY_RULE_SETUP -#line 131 "QuantityParser.l" +#line 132 "QuantityParser.l" return SINH; YY_BREAK case 80: YY_RULE_SETUP -#line 132 "QuantityParser.l" +#line 133 "QuantityParser.l" return TAN; YY_BREAK case 81: YY_RULE_SETUP -#line 133 "QuantityParser.l" +#line 134 "QuantityParser.l" return TANH; YY_BREAK case 82: YY_RULE_SETUP -#line 134 "QuantityParser.l" +#line 135 "QuantityParser.l" return SQRT; YY_BREAK case 83: YY_RULE_SETUP -#line 136 "QuantityParser.l" +#line 137 "QuantityParser.l" ECHO; YY_BREAK #line 1237 "QuantityLexer.c" @@ -1527,7 +1527,7 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 138 ) + if ( yy_current_state >= 136 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; @@ -1555,11 +1555,11 @@ static int yy_get_next_buffer (void) while ( yy_chk[yy_base[yy_current_state] + yy_c] != yy_current_state ) { yy_current_state = (int) yy_def[yy_current_state]; - if ( yy_current_state >= 138 ) + if ( yy_current_state >= 136 ) yy_c = yy_meta[(unsigned int) yy_c]; } yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c]; - yy_is_jam = (yy_current_state == 137); + yy_is_jam = (yy_current_state == 135); return yy_is_jam ? 0 : yy_current_state; } @@ -2192,4 +2192,4 @@ void yyfree (void * ptr ) #define YYTABLES_NAME "yytables" -#line 136 "QuantityParser.l" +#line 137 "QuantityParser.l" diff --git a/src/Base/QuantityParser.l b/src/Base/QuantityParser.l index f1dfddf776..c1dfb7e235 100644 --- a/src/Base/QuantityParser.l +++ b/src/Base/QuantityParser.l @@ -37,13 +37,13 @@ ID [a-z][a-z0-9]* [-+()=/*^] { return *yytext; } - "nm" yylval = Quantity::NanoMeter; return UNIT; // nano meter - "ym" yylval = Quantity::MicroMeter; return UNIT; // micro meter - "mm" yylval = Quantity::MilliMeter; return UNIT; // milli meter (internal standard length) - "cm" yylval = Quantity::CentiMeter; return UNIT; // centi meter - "dm" yylval = Quantity::DeciMeter; return UNIT; // deci meter - "m" yylval = Quantity::Meter; return UNIT; // meter - "km" yylval = Quantity::KiloMeter; return UNIT; // kilo meter + "nm" yylval = Quantity::NanoMetre; return UNIT; // nano meter + "ym" yylval = Quantity::MicroMetre; return UNIT; // micro meter + "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 @@ -51,7 +51,7 @@ ID [a-z][a-z0-9]* "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; // ton + "t" yylval = Quantity::Ton; return UNIT; // Metric Tonne "s" yylval = Quantity::Second; return UNIT; // second (internal standard time) "min" yylval = Quantity::Minut; return UNIT; // minute @@ -76,7 +76,8 @@ ID [a-z][a-z0-9]* "'" yylval = Quantity::Foot; return UNIT; // foot "th" yylval = Quantity::Thou; return UNIT; // thou "yr" yylval = Quantity::Yard; return UNIT; // yard - "mile" yylval = Quantity::Mile; return UNIT; // mile + "mi" yylval = Quantity::Mile; return UNIT; // mile + "lb" yylval = Quantity::Pound; return UNIT; // pound diff --git a/src/Base/QuantityPyImp.cpp b/src/Base/QuantityPyImp.cpp index d4bfe96b41..e8f776cf3c 100644 --- a/src/Base/QuantityPyImp.cpp +++ b/src/Base/QuantityPyImp.cpp @@ -181,7 +181,7 @@ int QuantityPy::setCustomAttributes(const char* /*attr*/, PyObject* /*obj*/) Py::Object QuantityPy::getNanoMeter(void) const { - return Py::Object(new QuantityPy(new Quantity(Quantity::NanoMeter))); + return Py::Object(new QuantityPy(new Quantity(Quantity::NanoMetre))); }