#pragma hdrstop
#endif
-#if wxUSE_IOSTREAMH
- #include <fstream.h>
-#else
- #include <fstream>
-#endif
-
#include <stdarg.h>
#include <ctype.h>
#include <string.h>
#include "wx/utils.h"
-
#include "wx/expr.h"
#include "wx/wxexpr.h"
switch (the_type)
{
case wxExprWord:
- value.word = copystring((const char *)word_or_string);
+ value.word = copystring((const wxChar *)word_or_string);
break;
case wxExprString:
- value.string = copystring((const char *)word_or_string);
+ value.string = copystring((const wxChar *)word_or_string);
break;
case wxExprList:
last = NULL;
next = NULL;
}
-wxExpr::wxExpr(wxExprType the_type, char *word_or_string, bool allocate)
+wxExpr::wxExpr(wxExprType the_type, wxChar *word_or_string, bool allocate)
{
type = the_type;
{
wxExpr *secondNode = firstNode->next;
if ((secondNode->type == wxExprWord) &&
- (strcmp((const char *)word, secondNode->value.word) == 0))
+ (wxStrcmp((const wxChar *)word, secondNode->value.word) == 0))
{
return expr;
}
wxString wxExpr::Functor(void) const // Use only for a clause
{
if ((type != wxExprList) || !value.first)
- return wxString("");
+ return wxString(_T(""));
if (value.first->type == wxExprWord)
return wxString(value.first->value.word);
else
- return wxString("");
+ return wxString(_T(""));
}
bool wxExpr::IsFunctor(const wxString& f) const // Use only for a clause
return FALSE;
return (value.first->type == wxExprWord &&
- (strcmp((const char *)f, value.first->value.word) == 0));
+ (wxStrcmp((const wxChar *)f, value.first->value.word) == 0));
}
// Return nth argument of a clause (starting from 1)
{
wxExpr *secondNode = firstNode->next;
if ((secondNode->type == wxExprWord) &&
- (strcmp((const char *)attribute, secondNode->value.word) == 0))
+ (wxStrcmp((const wxChar *)attribute, secondNode->value.word) == 0))
{
wxExpr *nextExpr = expr->next;
delete expr;
// DeleteAttributeValue(attribute);
wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr = new wxExpr(wxExprList);
wxExpr *patt = new wxExpr(wxExprWord, attribute);
wxExpr *pval = new wxExpr(val);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr = new wxExpr(wxExprList);
// DeleteAttributeValue(attribute);
wxExpr *patt = new wxExpr(wxExprWord, attribute);
wxExpr *pval = new wxExpr(val);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr = new wxExpr(wxExprList);
wxExpr *patt = new wxExpr(wxExprWord, attribute);
wxExpr *pval = new wxExpr(wxExprString, val);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr = new wxExpr(wxExprList);
wxExpr *patt = new wxExpr(wxExprWord, attribute);
wxExpr *pval = new wxExpr(wxExprWord, val);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr = new wxExpr(wxExprList);
wxExpr *patt = new wxExpr(wxExprWord, attribute);
wxExpr *pval = new wxExpr(val);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr = new wxExpr(wxExprList);
// Now make an (=, Att, Value) triple
wxExpr *patt = new wxExpr(wxExprWord, attribute);
- wxExpr *pequals = new wxExpr(wxExprWord, "=");
+ wxExpr *pequals = new wxExpr(wxExprWord, _T("="));
wxExpr *listExpr2 = new wxExpr(wxExprList);
}
// Compatibility
-void wxExpr::AssignAttributeValue(char *att, char **var) const
+void wxExpr::AssignAttributeValue(wxChar *att, wxChar **var) const
{
wxString str;
if (GetAttributeValue(att, str))
{
if (*var)
delete[] *var;
- *var = copystring((const char *) str);
+ *var = copystring((const wxChar *) str);
}
}
-void wxExpr::WriteClause(ostream& stream) // Write this expression as a top-level clause
+void wxExpr::WriteClause(FILE* stream) // Write this expression as a top-level clause
{
if (type != wxExprList)
return;
if (node)
{
node->WriteExpr(stream);
- stream << "(";
+ fprintf( stream, "(" );
node = node->next;
bool first = TRUE;
while (node)
{
if (!first)
- stream << " ";
+ fprintf( stream, " " );
node->WriteExpr(stream);
node = node->next;
- if (node) stream << ",\n";
+ if (node)
+ fprintf( stream, ",\n" );
first = FALSE;
}
- stream << ").\n\n";
+ fprintf( stream, ").\n\n" );
}
}
-void wxExpr::WriteExpr(ostream& stream) // Write as any other subexpression
+void wxExpr::WriteExpr(FILE* stream) // Write as any other subexpression
{
// This seems to get round an optimizer bug when
// using Watcom C++ 10a in WIN32 compilation mode.
{
case wxExprInteger:
{
- stream << value.integer;
+ fprintf( stream, "%ld", value.integer );
break;
}
case wxExprReal:
{
double f = value.real;
-/* Now the parser can cope with this.
- // Prevent printing in 'e' notation. Any better way?
- if (fabs(f) < 0.00001)
- f = 0.0;
-*/
- char buf[40];
- sprintf(buf, "%.6g", f);
- stream << buf;
+ fprintf( stream, "%.6g", f);
break;
}
case wxExprString:
{
- stream << "\"";
+ fprintf( stream, "\"" );
int i;
- int len = strlen(value.string);
+ const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.string);
+ int len = strlen(val);
for (i = 0; i < len; i++)
{
- char ch = value.string[i];
+ char ch = val[i];
if (ch == '"' || ch == '\\')
- stream << "\\";
- stream << ch;
+ fprintf( stream, "\\" );
+ char tmp[2];
+ tmp[0] = ch;
+ tmp[1] = 0;
+ fprintf( stream, tmp );
}
-
- stream << "\"";
+ fprintf( stream, "\"" );
break;
}
case wxExprWord:
{
bool quote_it = FALSE;
- int len = strlen(value.word);
- if ((len == 0) || (len > 0 && (value.word[0] > 64 && value.word[0] < 91)))
+ const wxWX2MBbuf val = wxConvLibc.cWX2MB(value.word);
+ int len = strlen(val);
+ if ((len == 0) || (len > 0 && (val[0] > 64 && val[0] < 91)))
quote_it = TRUE;
else
{
int i;
for (i = 0; i < len; i++)
- if ((!isalpha(value.word[i])) && (!isdigit(value.word[i])) &&
- (value.word[i] != '_'))
+ if ((!isalpha(val[i])) && (!isdigit(val[i])) &&
+ (val[i] != '_'))
{ quote_it = TRUE; i = len; }
}
if (quote_it)
- stream << "'";
+ fprintf( stream ,"'" );
- stream << value.word;
+ fprintf( stream, (const char*) val );
if (quote_it)
- stream << "'";
+ fprintf( stream, "'" );
break;
}
case wxExprList:
{
if (!value.first)
- stream << "[]";
+ fprintf( stream, "[]" );
else
{
wxExpr *expr = value.first;
- if ((expr->Type() == wxExprWord) && (strcmp(expr->WordValue(), "=") == 0))
+ if ((expr->Type() == wxExprWord) && (wxStrcmp(expr->WordValue(), _T("=")) == 0))
{
wxExpr *arg1 = expr->next;
wxExpr *arg2 = arg1->next;
arg1->WriteExpr(stream);
- stream << " = ";
+ fprintf( stream, " = " );
arg2->WriteExpr(stream);
}
else
{
- stream << "[";
+ fprintf( stream, "[" );
while (expr)
{
expr->WriteExpr(stream);
expr = expr->next;
- if (expr) stream << ", ";
+ if (expr)
+ fprintf( stream, ", " );
}
- stream << "]";
+ fprintf( stream, "]" );
}
}
break;
}
}
-void wxExpr::WriteLispExpr(ostream& stream)
-{
- switch (type)
- {
- case wxExprInteger:
- {
- stream << value.integer;
- break;
- }
- case wxExprReal:
- {
- stream << value.real;
- break;
- }
- case wxExprString:
- {
- stream << "\"" << value.string << "\"";
- break;
- }
- case wxExprWord:
- {
- stream << value.word;
- break;
- }
- case wxExprList:
- {
- wxExpr *expr = value.first;
-
- stream << "(";
- while (expr)
- {
- expr->WriteLispExpr(stream);
- expr = expr->next;
- if (expr) stream << " ";
- }
-
- stream << ")";
- break;
- }
- case wxExprNull: break;
- }
-}
-
/*
* wxExpr 'database' (list of expressions)
*/
wxExpr *expr = clause->AttributeValue(attribute_to_hash);
if (expr)
{
- long functor_key = hash_table->MakeKey((char *)(const char *)functor);
+ long functor_key = hash_table->MakeKey(WXSTRINGCAST functor);
long value_key = 0;
if (expr && expr->Type() == wxExprString)
{
- value_key = hash_table->MakeKey((char *)(const char *)expr->StringValue());
- hash_table->Put(functor_key + value_key, (char *)(const char *)expr->StringValue(), (wxObject *)clause);
+ value_key = hash_table->MakeKey(WXSTRINGCAST expr->StringValue());
+ hash_table->Put(functor_key + value_key, WXSTRINGCAST expr->StringValue(), (wxObject *)clause);
}
else if (expr && expr->Type() == wxExprInteger)
{
wxExpr *wxExprDatabase::HashFind(const wxString& functor, long value) const
{
- long key = hash_table->MakeKey((char *)(const char *)functor) + value;
+ long key = hash_table->MakeKey(WXSTRINGCAST functor) + value;
// The key alone isn't guaranteed to be unique:
// must supply value too. Let's assume the value of the
wxExpr *wxExprDatabase::HashFind(const wxString& functor, const wxString& value) const
{
- long key = hash_table->MakeKey((char *)(const char *)functor) + hash_table->MakeKey((char *)(const char *)value);
- return (wxExpr *)hash_table->Get(key, (char *)(const char *)value);
+ long key = hash_table->MakeKey(WXSTRINGCAST functor) + hash_table->MakeKey(WXSTRINGCAST value);
+ return (wxExpr *)hash_table->Get(key, WXSTRINGCAST value);
}
void wxExprDatabase::ClearDatabase(void)
{
noErrors = 0;
- FILE *f = fopen((const char *)filename, "r");
+ FILE *f = fopen(filename.fn_str(), "r");
if (f)
{
thewxExprDatabase = this;
noErrors = 0;
thewxExprDatabase = this;
- LexFromString((char *)(const char *)buffer);
+ const wxWX2MBbuf buf = buffer.mb_str();
+ LexFromString(MBSTRINGCAST buf);
yyparse();
wxExprCleanUp();
return (noErrors == 0);
bool wxExprDatabase::Write(const wxString& fileName)
{
- ofstream str((char *)(const char *)fileName);
- if (str.bad())
+ FILE *stream = fopen( fileName.fn_str(), "w+" );
+
+ if (!stream)
return FALSE;
- return Write(str);
+
+ return Write(stream);
}
-bool wxExprDatabase::Write(ostream& stream)
+bool wxExprDatabase::Write(FILE *stream)
{
noErrors = 0;
wxNode *node = First();
return (noErrors == 0);
}
-void wxExprDatabase::WriteLisp(ostream& stream)
-{
- noErrors = 0;
- wxNode *node = First();
- while (node)
- {
- wxExpr *expr = (wxExpr *)node->Data();
- expr->WriteLispExpr(stream);
- stream << "\n\n";
- node = node->Next();
- }
-}
-
void add_expr(wxExpr * expr)
{
thewxExprDatabase->Append(expr);
char *wxmake_string(char *str)
{
- char *s, *t;
+ wxChar *s, *t;
int len, i;
+ const wxMB2WXbuf sbuf = wxConvLibc.cMB2WX(str);
- str++; /* skip leading quote */
- len = strlen(str) - 1; /* ignore trailing quote */
+// str++; /* skip leading quote */
+ len = wxStrlen(sbuf) - 1; /* ignore trailing quote */
- s = new char[len + 1];
+ s = new wxChar[len + 1];
t = s;
- for(i=0; i<len; i++)
+ for(i=1; i<len; i++) // 1 since we want to skip leading quote
{
- if (str[i] == '\\' && str[i+1] == '"')
+ if (sbuf[i] == _T('\\') && sbuf[i+1] == _T('"'))
{
- *t++ = '"';
+ *t++ = _T('"');
i ++;
}
- else if (str[i] == '\\' && str[i+1] == '\\')
+ else if (sbuf[i] == _T('\\') && sbuf[i+1] == _T('\\'))
{
- *t++ = '\\';
+ *t++ = _T('\\');
i ++;
}
else
- *t++ = str[i];
+ *t++ = sbuf[i];
}
- *t = '\0';
+ *t = _T('\0');
wxExpr *x = new wxExpr(wxExprString, s, FALSE);
return (char *)x;
projects / wxWidgets.git / blobdiff