1)core dump in regex for big strings 2) Boolean Var bugs 3) adding support for other...

[satune.git] / src / AlloyEnc / signature.h

diff --git a/src/AlloyEnc/signature.h b/src/AlloyEnc/signature.h
index b3ebf47b84bbfba798b394e865fc7ca9301b7149..1b321a6f134590f8d7bbac8fbcece632119d9861 100644 (file)
--- a/src/AlloyEnc/signature.h
+++ b/src/AlloyEnc/signature.h
@@ -10,23 +10,31 @@ public:
        Signature(uint _id):id(_id){}
        string operator+(const string& s);
        virtual string toString() const = 0;
+       virtual string getAbsSignature() const =0;
        virtual string getSignature() const =0;
        virtual ~Signature(){}
 protected:
        uint id;
 };
 
-class BooleanSig: public Signature{
+class ValuedSignature: public Signature{
+public:
+       ValuedSignature(uint id);
+       int getValue();
+       void setValue(int v){value = v;}
+protected:
+       int value;
+};
+
+class BooleanSig: public ValuedSignature{
 public:
        BooleanSig(uint id);
-       bool getValue();
-       void setValue(bool v) {value = v; }
        virtual ~BooleanSig(){}
        virtual string toString() const;
+       virtual string getAbsSignature() const;
        virtual string getSignature() const;
 private:
-       int value;
-       static bool encodeAbsSig;
+       static bool encodeAbs;
 };
 
 class SetSig: public Signature{
@@ -34,22 +42,23 @@ public:
        SetSig(uint id, Set *set);
        virtual ~SetSig(){}
        virtual string toString() const;
+       virtual string getAbsSignature() const;
        virtual string getSignature() const;
+       static bool encodeAbs;
 private:
        string domain;
 };
 
-class ElementSig: public Signature{
+class ElementSig: public ValuedSignature{
 public:
        ElementSig(uint id, SetSig *ssig);
-       uint64_t getValue() { return value;}
-       void setValue(uint64_t v){value = v;}
        virtual ~ElementSig(){}
        virtual string toString() const;
+       virtual string getAbsSignature() const;
        virtual string getSignature() const;
 private:
        SetSig *ssig;
-       uint64_t value;
+       static bool encodeAbs;
 };
 
 string operator+(const string& str, const Signature& sig);