Remove more Locale Kit cruft.
BNumberFormat is the way to go for all of this. This code was not even compiled in.
This commit is contained in:
@@ -10,7 +10,6 @@
|
||||
#include <FormatImpl.h>
|
||||
#include <FormatParameters.h>
|
||||
#include <FormattingConventions.h>
|
||||
#include <GenericNumberFormat.h>
|
||||
#include <Language.h>
|
||||
#include <Locale.h>
|
||||
#include <NumberFormat.h>
|
||||
|
||||
@@ -1,157 +0,0 @@
|
||||
#ifndef _B_GENERIC_NUMBER_FORMAT_H_
|
||||
#define _B_GENERIC_NUMBER_FORMAT_H_
|
||||
|
||||
#include <IntegerFormatParameters.h>
|
||||
|
||||
class BString;
|
||||
struct format_field_position;
|
||||
|
||||
class BGenericNumberFormat {
|
||||
public:
|
||||
BGenericNumberFormat();
|
||||
~BGenericNumberFormat();
|
||||
|
||||
status_t FormatInteger(const BIntegerFormatParameters *parameters,
|
||||
int64 number, BString *buffer,
|
||||
format_field_position *positions = NULL,
|
||||
int32 positionCount = 1,
|
||||
int32 *fieldCount = NULL,
|
||||
bool allFieldPositions = false) const;
|
||||
|
||||
status_t FormatInteger(const BIntegerFormatParameters *parameters,
|
||||
int64 number, char *buffer, size_t bufferSize,
|
||||
format_field_position *positions = NULL,
|
||||
int32 positionCount = 1,
|
||||
int32 *fieldCount = NULL,
|
||||
bool allFieldPositions = false) const;
|
||||
|
||||
status_t FormatInteger(const BIntegerFormatParameters *parameters,
|
||||
uint64 number, BString *buffer,
|
||||
format_field_position *positions = NULL,
|
||||
int32 positionCount = 1,
|
||||
int32 *fieldCount = NULL,
|
||||
bool allFieldPositions = false) const;
|
||||
|
||||
status_t FormatInteger(const BIntegerFormatParameters *parameters,
|
||||
uint64 number, char *buffer, size_t bufferSize,
|
||||
format_field_position *positions = NULL,
|
||||
int32 positionCount = 1,
|
||||
int32 *fieldCount = NULL,
|
||||
bool allFieldPositions = false) const;
|
||||
|
||||
// default number format parameters
|
||||
|
||||
status_t SetDefaultIntegerFormatParameters(
|
||||
const BIntegerFormatParameters *parameters);
|
||||
BIntegerFormatParameters *DefaultIntegerFormatParameters();
|
||||
const BIntegerFormatParameters *DefaultIntegerFormatParameters() const;
|
||||
|
||||
// other parameters configuring the formatter
|
||||
|
||||
status_t SetDigitSymbols(const char **digits);
|
||||
status_t SetFractionSeparator(const char *decimalSeparator);
|
||||
status_t SetGroupingInfo(const char **groupingSeparators,
|
||||
size_t separatorCount, size_t *groupSizes, size_t sizeCount);
|
||||
status_t SetExponentSymbol(const char *exponentSymbol,
|
||||
const char *upperCaseExponentSymbol = NULL);
|
||||
status_t SetSpecialNumberSymbols(const char *nan,
|
||||
const char *infinity, const char *negativeInfinity = NULL,
|
||||
const char *upperCaseNaN = NULL,
|
||||
const char *upperCaseInfinity = NULL,
|
||||
const char *upperCaseNegativeInfinity = NULL);
|
||||
status_t SetSignSymbols(const char *plusPrefix,
|
||||
const char *minusPrefix, const char *padPlusPrefix,
|
||||
const char *noForcePlusPrefix = NULL, const char *plusSuffix = NULL,
|
||||
const char *minusSuffix = NULL, const char *padPlusSuffix = NULL,
|
||||
const char *noForcePlusSuffix = NULL);
|
||||
status_t SetMantissaSignSymbols(const char *plusPrefix,
|
||||
const char *minusPrefix, const char *padPlusPrefix,
|
||||
const char *noForcePlusPrefix = NULL, const char *plusSuffix = NULL,
|
||||
const char *minusSuffix = NULL, const char *padPlusSuffix = NULL,
|
||||
const char *noForcePlusSuffix = NULL);
|
||||
status_t SetExponentSignSymbols(const char *plusPrefix,
|
||||
const char *minusPrefix, const char *plusSuffix = NULL,
|
||||
const char *minusSuffix = NULL);
|
||||
// TODO: Support engineering representation of scientific format (exponent
|
||||
// is a multiple of 3), i.e. allow setting the number of which the exponent
|
||||
// must be a multiple of.
|
||||
|
||||
private:
|
||||
class BufferWriter;
|
||||
class Float;
|
||||
class GroupingInfo;
|
||||
class Integer;
|
||||
class SignSymbols;
|
||||
struct SpecialNumberSymbols;
|
||||
|
||||
struct Symbol {
|
||||
char *symbol;
|
||||
int length;
|
||||
int char_count;
|
||||
|
||||
Symbol(const char *symbol = NULL);
|
||||
~Symbol();
|
||||
|
||||
status_t SetTo(const char *symbol);
|
||||
void Unset() { SetTo(NULL); }
|
||||
};
|
||||
|
||||
static const Symbol kDefaultDigitSymbols[];
|
||||
static const Symbol kDefaultFractionSeparator;
|
||||
static const Symbol kDefaultExponentSymbol;
|
||||
static const Symbol kDefaultUpperCaseExponentSymbol;
|
||||
static const Symbol kDefaultNaNSymbol;
|
||||
static const Symbol kDefaultUpperCaseNaNSymbol;
|
||||
static const Symbol kDefaultInfinitySymbol;
|
||||
static const Symbol kDefaultUpperCaseInfinitySymbol;
|
||||
static const Symbol kDefaultNegativeInfinitySymbol;
|
||||
static const Symbol kDefaultUpperCaseNegativeInfinitySymbol;
|
||||
|
||||
static const GroupingInfo kDefaultGroupingInfo;
|
||||
static const GroupingInfo kNoGroupingInfo;
|
||||
|
||||
static const SignSymbols kDefaultSignSymbols;
|
||||
static const SignSymbols kDefaultMantissaSignSymbols;
|
||||
static const SignSymbols kDefaultExponentSignSymbols;
|
||||
|
||||
status_t FormatInteger(const BIntegerFormatParameters *parameters,
|
||||
const Integer &integer, char *buffer,
|
||||
size_t bufferSize,
|
||||
format_field_position *positions = NULL,
|
||||
int32 positionCount = 1,
|
||||
int32 *fieldCount = NULL,
|
||||
bool allFieldPositions = false) const;
|
||||
|
||||
const Symbol *DigitSymbols() const;
|
||||
const Symbol *FractionSeparator() const;
|
||||
const GroupingInfo *GetGroupingInfo() const;
|
||||
const Symbol *ExponentSymbol(bool upperCase = false) const;
|
||||
const Symbol *NaNSymbol(bool upperCase = false) const;
|
||||
const Symbol *InfinitySymbol(bool upperCase = false) const;
|
||||
const Symbol *NegativeInfinitySymbol(bool upperCase = false) const;
|
||||
void GetSpecialNumberSymbols(bool upperCase,
|
||||
SpecialNumberSymbols *symbols) const;
|
||||
const SignSymbols *GetSignSymbols() const;
|
||||
const SignSymbols *MantissaSignSymbols() const;
|
||||
const SignSymbols *ExponentSignSymbols() const;
|
||||
|
||||
static status_t _SetSymbol(Symbol **symbol, const char *str);
|
||||
|
||||
BIntegerFormatParameters fIntegerParameters;
|
||||
Symbol *fDigitSymbols;
|
||||
Symbol *fFractionSeparator;
|
||||
GroupingInfo *fGroupingInfo;
|
||||
Symbol *fExponentSymbol;
|
||||
Symbol *fUpperCaseExponentSymbol;
|
||||
Symbol *fNaNSymbol;
|
||||
Symbol *fUpperCaseNaNSymbol;
|
||||
Symbol *fInfinitySymbol;
|
||||
Symbol *fUpperCaseInfinitySymbol;
|
||||
Symbol *fNegativeInfinitySymbol;
|
||||
Symbol *fUpperCaseNegativeInfinitySymbol;
|
||||
SignSymbols *fSignSymbols;
|
||||
SignSymbols *fMantissaSignSymbols;
|
||||
SignSymbols *fExponentSignSymbols;
|
||||
};
|
||||
|
||||
#endif // _B_GENERIC_NUMBER_FORMAT_H_
|
||||
Reference in New Issue
Block a user