Skip to content

Commit

Permalink
Merge pull request #4 from sailfishos/reformat
Browse files Browse the repository at this point in the history 
Reformat code with clang-format
  • Loading branch information
@pvuorela
pvuorela authored Jun 6, 2023
2 parents f9dea54 + 388da8a commit d94d70e
Show file tree
Hide file tree
Showing 19 changed files with 1,755 additions and 1,755 deletions.
15 changes: 0 additions & 15 deletions iodata.prf
View file

This file was deleted.

3 changes: 1 addition & 2 deletions root.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ TEMPLATE = subdirs
SUBDIRS = src tests type-to-cxx

prf.path = $$[QT_INSTALL_DATA]/mkspecs/features
equals(QT_MAJOR_VERSION, 4): prf.files = iodata.prf
equals(QT_MAJOR_VERSION, 5): prf.files = iodata-qt5.prf
prf.files = iodata-qt5.prf

INSTALLS = prf

Expand Down
5 changes: 0 additions & 5 deletions src/iodata
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1 @@
#include <QtGlobal>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include <iodata-qt5/iodata.h>
#else
#include <iodata/iodata.h>
#endif
307 changes: 149 additions & 158 deletions src/iodata.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,168 +23,159 @@

#include "iodata.h"

namespace iodata
{
bitmask::bitmask(bitmask_t literal, const char **symbolics)
{
xl = literal ;
for (const char **p=symbolics; *p; ++p)
xs.insert(*p) ;
}

void bitmask::assign(bitmask_t value, const bit_codec *codec)
{
xl = codec ? codec->encode(value, xs) : value ;
}

bitmask_t bitmask::value(const bit_codec *codec) const
{
return xl | codec->decode(xs) ;
}

void bit_codec::register_name(bitmask_t value, const string &name)
{
s2m.insert(make_pair(name, value)) ;
m2s.insert(make_pair((ordered_bitmask_t)value, name)) ;
}

bitmask_t bit_codec::encode(bitmask_t value, set<string> &masks) const
{
typedef map<ordered_bitmask_t,string>::const_iterator iterator ;
for(iterator it=m2s.begin(); value!=0 && it!=m2s.end(); ++it)
{
bitmask_t m = it->first ;
if((value&m)==m)
{
masks.insert(it->second) ;
value &= ~m ;
}
namespace iodata {
bitmask::bitmask(bitmask_t literal, const char **symbolics)
{
xl = literal;
for (const char **p = symbolics; *p; ++p)
xs.insert(*p);
}

void bitmask::assign(bitmask_t value, const bit_codec *codec)
{
xl = codec ? codec->encode(value, xs) : value;
}

bitmask_t bitmask::value(const bit_codec *codec) const
{
return xl | codec->decode(xs);
}

void bit_codec::register_name(bitmask_t value, const string &name)
{
s2m.insert(make_pair(name, value));
m2s.insert(make_pair((ordered_bitmask_t) value, name));
}

bitmask_t bit_codec::encode(bitmask_t value, set<string> &masks) const
{
typedef map<ordered_bitmask_t, string>::const_iterator iterator;
for (iterator it = m2s.begin(); value != 0 && it != m2s.end(); ++it) {
bitmask_t m = it->first;
if ((value & m) == m) {
masks.insert(it->second);
value &= ~m;
}
}
return value ;
}

bitmask_t bit_codec::decode(const string &name) const
{
map<string,bitmask_t>::const_iterator it = s2m.find(name) ;
if(it==s2m.end())
throw iodata::exception(name+": invalid bit mask name") ;
return it->second ;
}

bitmask_t bit_codec::decode(const set<string> &names) const
{
bitmask_t res = 0 ;
for(set<string>::const_iterator it=names.begin(); it!=names.end(); ++it)
res |= decode(*it) ;
return res ;
}

ostream &operator<<(ostream &os, const record &x)
{
x.plain_output(os, "") ;
return os ;
}

void integer::plain_output(ostream &os, const string &prefix) const
{
os << prefix << "=" << x << endl ;
}

void bytes::output(ostream &os) const
{
for(string::const_iterator it=x.begin(); it!=x.end(); ++it)
{
unsigned char ch = *it ;
#define __hex(x) char((x)<10?'0'+(x):'a'+(x)-10)
if(ch<0x20 || ch>=0x7F || ch=='\\')
os << '\\' << __hex(ch>>4) << __hex(ch&0x0F) ;
return value;
}

bitmask_t bit_codec::decode(const string &name) const
{
map<string, bitmask_t>::const_iterator it = s2m.find(name);
if (it == s2m.end())
throw iodata::exception(name + ": invalid bit mask name");
return it->second;
}

bitmask_t bit_codec::decode(const set<string> &names) const
{
bitmask_t res = 0;
for (set<string>::const_iterator it = names.begin(); it != names.end(); ++it)
res |= decode(*it);
return res;
}

ostream &operator<<(ostream &os, const record &x)
{
x.plain_output(os, "");
return os;
}

void integer::plain_output(ostream &os, const string &prefix) const
{
os << prefix << "=" << x << endl;
}

void bytes::output(ostream &os) const
{
for (string::const_iterator it = x.begin(); it != x.end(); ++it) {
unsigned char ch = *it;
#define __hex(x) char((x) < 10 ? '0' + (x) : 'a' + (x) -10)
if (ch < 0x20 || ch >= 0x7F || ch == '\\')
os << '\\' << __hex(ch >> 4) << __hex(ch & 0x0F);
#undef __hex
else
os << ch ;
else
os << ch;
}
}

void bytes::plain_output(ostream &os, const string &prefix) const
{
os << prefix ;
os << '"' ;
output(os) ;
os << endl ;
}

void bitmask::plain_output(ostream &os, const string &prefix) const
{
if(xl)
os << prefix << '+' << xl << endl ;
for(set<string>::const_iterator it=xs.begin(); it!=xs.end(); ++it)
os << prefix << '|' << *it << endl ;
}

void array::plain_output(ostream &os, const string &prefix) const
{
for(unsigned i=0; i<x.size(); ++i)
{
ostringstream num ;
num << prefix << "/" << i ;
x[i]->plain_output(os, num.str()) ;
}
}

const item *item::get(unsigned i) const
{
const array *a = arr() ;
if(a->x.size()<=i)
{
ostringstream os ;
os << "index " << i << " is out or range" ;
throw exception(os.str()) ;
}

void bytes::plain_output(ostream &os, const string &prefix) const
{
os << prefix;
os << '"';
output(os);
os << endl;
}

void bitmask::plain_output(ostream &os, const string &prefix) const
{
if (xl)
os << prefix << '+' << xl << endl;
for (set<string>::const_iterator it = xs.begin(); it != xs.end(); ++it)
os << prefix << '|' << *it << endl;
}

void array::plain_output(ostream &os, const string &prefix) const
{
for (unsigned i = 0; i < x.size(); ++i) {
ostringstream num;
num << prefix << "/" << i;
x[i]->plain_output(os, num.str());
}
return a->x[i] ;
}

const item *item::get(const string &key) const
{
const record *r = rec() ;
map<string,item*>::const_iterator it = r->x.find(key) ;
if(it==r->x.end())
throw exception(key+": key not found") ;
return it->second ;
}

void record::plain_output(ostream &os, const string &prefix) const
{
for(map<string,item*>::const_iterator it=x.begin(); it!=x.end(); ++it)
{
ostringstream num ;
num << prefix << "." << it->first ;
it->second->plain_output(os, num.str()) ;
}

const item *item::get(unsigned i) const
{
const array *a = arr();
if (a->x.size() <= i) {
ostringstream os;
os << "index " << i << " is out or range";
throw exception(os.str());
}
}

record::~record()
{
for(map<string,item*>::const_iterator it=x.begin(); it!=x.end(); ++it)
delete it->second ;
}

array::~array()
{
for(unsigned i=0; i<x.size(); ++i)
delete x[i] ;
}

QString parse_and_print(QString input)
{
string in = input.toStdString() ;
istringstream in_s(in) ;
iodata::parser x(in_s) ;
if(x.parse())
{
ostringstream out ;
out << * x.tree ;
return QString::fromStdString(out.str()) ;
return a->x[i];
}

const item *item::get(const string &key) const
{
const record *r = rec();
map<string, item *>::const_iterator it = r->x.find(key);
if (it == r->x.end())
throw exception(key + ": key not found");
return it->second;
}

void record::plain_output(ostream &os, const string &prefix) const
{
for (map<string, item *>::const_iterator it = x.begin(); it != x.end(); ++it) {
ostringstream num;
num << prefix << "." << it->first;
it->second->plain_output(os, num.str());
}
else
return "NULL\n" ;
}
}

record::~record()
{
for (map<string, item *>::const_iterator it = x.begin(); it != x.end(); ++it)
delete it->second;
}

array::~array()
{
for (unsigned i = 0; i < x.size(); ++i)
delete x[i];
}

QString parse_and_print(QString input)
{
string in = input.toStdString();
istringstream in_s(in);
iodata::parser x(in_s);
if (x.parse()) {
ostringstream out;
out << *x.tree;
return QString::fromStdString(out.str());
} else
return "NULL\n";
}
} // namespace iodata
Loading

0 comments on commit d94d70e

Please sign in to comment.