Changeset e7de6cc for src/dgp/thesymbols.hh

Timestamp:

02/21/12 20:02:51 (14 years ago)

Author:

Tomasz Obrebski <to@…>

Branches:

master

Children:

b242df2

Parents:

354ba3d

git-author:

Tomasz Obrebski <to@…> (02/21/12 20:02:51)

git-committer:

Tomasz Obrebski <to@…> (02/21/12 20:02:51)

Message:

new version of dgp
added dgc, tre and compdic components
compiledic renamed to compdic_utf8
./configure updated

File:

• src/dgp/thesymbols.hh (modified) (1 diff)

src/dgp/thesymbols.hh

@@ -9 +9 @@
 #include <bitset>
 
-typedef Symbol<1> Cat;
+using namespace std;
 
-typedef Symbol<2> Role;
-typedef list<Role> RoleList;
-typedef list<Role>::iterator RoleListIter;
-typedef bitset<MAXTYPES> RoleSet;
-typedef set<Role> Roles;
-typedef Roles::iterator RolesIter;
+typedef Symbol<1>              Cat;
+typedef bitset<MAXCATS>        CatSet;
 
-typedef Symbol<3> Constr;
-typedef list<Constr> ConstrList;
+typedef Symbol<2>              Role;
+typedef list<Role>             RoleList;
+typedef list<Role>::iterator   RoleListIter;
+typedef bitset<MAXTYPES>       RoleSet;
+typedef set<Role>              Roles;
+typedef Roles::iterator        RolesIter;
+
+typedef Symbol<3>              Constr;
+typedef list<Constr>           ConstrList;
 typedef list<Constr>::iterator ConstrListIter;
 
-typedef Symbol<4> Rel;
+typedef Symbol<4>              LongRel;
+typedef set<LongRel>           LongRels;
 
-typedef Symbol<5> Flag;
-typedef bitset<MAXFLAGS> FlagSet;
+typedef Symbol<5>              Flag;
+typedef bitset<MAXFLAGS>       FlagSet;
+
+typedef Symbol<6>              Prop;
+typedef bitset<MAXPROPS>       PropSet;
 
 #endif