hscript: Refactor Keys to be owned by a Script*

This means that a Key can introspect its Script.

1 files changed, 59 insertions, 46 deletions

diff --git a/hscript/disk.hh b/hscript/disk.hh
index 4adf8f5..e777c8f 100644
--- a/hscript/disk.hh
+++ b/hscript/disk.hh
@@ -3,7 +3,7 @@
  * libhscript, the HorizonScript library for
  * Project Horizon
  *
- * Copyright (c) 2019 Adélie Linux and contributors.  All rights reserved.
+ * Copyright (c) 2019-2020 Adélie Linux and contributors.  All rights reserved.
  * This code is licensed under the AGPL 3.0 license, as noted in the
  * LICENSE-code file in the root directory of this repository.
  *
@@ -23,17 +23,19 @@ private:
     const std::string _block;
     const std::string _ident;
 
-    DiskId(int _line, const std::string &my_block, const std::string &my_i) :
-        Key(_line), _block(my_block), _ident(my_i) {}
+    DiskId(const Script *_s, int _line, const std::string &my_block,
+           const std::string &my_i) :
+        Key(_s, _line), _block(my_block), _ident(my_i) {}
 public:
     /*! Retrieve the block device that this key identifies. */
     const std::string device() const { return this->_block; }
     /*! Retrieve the identification for the block device. */
     const std::string ident() const { return this->_ident; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 class DiskLabel : public Key {
@@ -51,17 +53,19 @@ private:
     const std::string _block;
     const LabelType _type;
 
-    DiskLabel(int _line, const std::string &_b, const LabelType &_t) :
-        Key(_line), _block(_b), _type(_t) {}
+    DiskLabel(const Script *_s, int _line, const std::string &_b,
+              const LabelType &_t) :
+        Key(_s, _line), _block(_b), _type(_t) {}
 public:
     /*! Retrieve the block device that this key identifies. */
     const std::string device() const { return this->_block; }
     /*! Retrieve the type of disklabel for the block device. */
     LabelType type() const { return this->_type; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 /*! The type of size a disk key has */
@@ -96,9 +100,9 @@ private:
     const uint64_t _size;
     const PartitionType _type;
 
-    Partition(int _line, const std::string &_b, const int _p,
+    Partition(const Script *_sc, int _line, const std::string &_b, const int _p,
               const SizeType _st, const uint64_t _s, const PartitionType _pt) :
-        Key(_line), _block(_b), _partno(_p), _size_type(_st), _size(_s),
+        Key(_sc, _line), _block(_b), _partno(_p), _size_type(_st), _size(_s),
         _type(_pt) {}
 public:
     /*! Retrieve the block device that this key identifies. */
@@ -112,9 +116,10 @@ public:
     /*! Retrieve the Type Code of this partition, if any. */
     PartitionType type() const { return this->_type; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 class Encrypt : public Key {
@@ -122,25 +127,28 @@ private:
     const std::string _block;
     const std::string _pw;
 
-    Encrypt(int _line, const std::string &_b, const std::string &_p) :
-        Key(_line), _block(_b), _pw(_p) {}
+    Encrypt(const Script *_s, int _line, const std::string &_b,
+            const std::string &_p) : Key(_s, _line), _block(_b), _pw(_p) {}
 public:
     /*! Retrieve the block device that this key encrypts. */
     const std::string device() const { return this->_block; }
     /*! Retrieve the passphrase used to encrypt the block device. */
     const std::string passphrase() const { return this->_pw; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 class LVMPhysical : public StringKey {
 private:
-    LVMPhysical(int _line, const std::string &_d) : StringKey(_line, _d) {}
+    LVMPhysical(const Script *_s, int _line, const std::string &_d) :
+        StringKey(_s, _line, _d) {}
 public:
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool execute() const override;
 };
 
 class LVMGroup : public Key {
@@ -148,19 +156,21 @@ private:
     const std::string _pv;
     const std::string _vgname;
 
-    LVMGroup(int _line, const std::string &_p, const std::string &_v) :
-        Key(_line), _pv(_p), _vgname(_v) {}
+    LVMGroup(const Script *_s, int _line, const std::string &_p,
+             const std::string &_v) :
+        Key(_s, _line), _pv(_p), _vgname(_v) {}
 public:
     /*! Retrieve the physical volume where this volume group will reside. */
     const std::string pv() const { return this->_pv; }
     /*! Retrieve the name of this volume group. */
     const std::string name() const { return this->_vgname; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
     /*! Determine if the PV passed is a real one. */
-    bool test_pv(ScriptOptions) const;
-    bool execute(ScriptOptions) const override;
+    bool test_pv() const;
+    bool execute() const override;
 };
 
 class LVMVolume : public Key {
@@ -170,9 +180,9 @@ private:
     const SizeType _size_type;
     const uint64_t _size;
 
-    LVMVolume(int _line, const std::string &_v, const std::string &_n,
-              SizeType _t, uint64_t _s) : Key(_line), _vg(_v), _lvname(_n),
-        _size_type(_t), _size(_s) {}
+    LVMVolume(const Script *_sc, int _line, const std::string &_v,
+              const std::string &_n, SizeType _t, uint64_t _s) :
+        Key(_sc, _line), _vg(_v), _lvname(_n), _size_type(_t), _size(_s) {}
 public:
     /*! Retrieve the volume group to which this volume belongs. */
     const std::string vg() const { return this->_vg; }
@@ -183,9 +193,10 @@ public:
     /*! Retrieve the size of this volume. */
     uint64_t size() const { return this->_size; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 class Filesystem : public Key {
@@ -203,17 +214,18 @@ private:
     const std::string _block;
     FilesystemType _type;
 
-    Filesystem(int _line, const std::string &_b, FilesystemType _t) :
-        Key(_line), _block(_b), _type(_t) {}
+    Filesystem(const Script *_s, int _line, const std::string &_b,
+               FilesystemType _t) : Key(_s, _line), _block(_b), _type(_t) {}
 public:
     /*! Retrieve the block device on which to create the filesystem. */
     const std::string device() const { return this->_block; }
     /*! Retreive the type of filesystem to create. */
     FilesystemType fstype() const { return this->_type; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 class Mount : public Key {
@@ -222,9 +234,9 @@ private:
     const std::string _mountpoint;
     const std::string _opts;
 
-    Mount(int _line, const std::string &my_block,
+    Mount(const Script *_s, int _line, const std::string &my_block,
           const std::string &my_mountpoint, const std::string &my_opts = "") :
-        Key(_line), _block(my_block), _mountpoint(my_mountpoint),
+        Key(_s, _line), _block(my_block), _mountpoint(my_mountpoint),
         _opts(my_opts) {}
 public:
     /*! Retrieve the block device to which this mount pertains. */
@@ -234,9 +246,10 @@ public:
     /*! Retrieve the mount options for this mount, if any. */
     const std::string options() const { return this->_opts; }
 
-    static Key *parseFromData(const std::string &, int, int*, int*);
-    bool validate(ScriptOptions) const override;
-    bool execute(ScriptOptions) const override;
+    static Key *parseFromData(const std::string &, int, int*, int*,
+                              const Script *);
+    bool validate() const override;
+    bool execute() const override;
 };
 
 }