Commit: 3712d467a9f05c0587450b39188c49ccd8f10b88 - joestar (git)

programming language

Commit MetaInfo

• Révision: 3712d467a9f05c0587450b39188c49ccd8f10b88 (tree)
• l'heure: 2023-02-22 23:41:24
• Auteur: dhrname <dhrname@joes...>
• Commiter: dhrname

Message de Log

Modify the MetaPhrase class

Change Summary

• modified: bin/obj/main.o
• modified: include/phrase.hpp
• modified: main.cpp

Modification

Binary files a/bin/obj/main.o and b/bin/obj/main.o differ

--- a/include/phrase.hpp
+++ b/include/phrase.hpp
@@ -1240,11 +1240,13 @@ namespace jstr
   class MetaPhrase: public Phrase
   {
     private:
-    std::unordered_set<int64_t> firstSet;
-    std::unordered_set<int64_t> followSet;
+    std::unordered_set<int32_t> firstSet;
+    std::unordered_set<int32_t> followSet;
     
     public:
     MetaPhrase()
+    : firstSet{},
+      followSet{}
     {}
     
     virtual ~MetaPhrase()
@@ -1255,11 +1257,11 @@ namespace jstr
     
     /*getFirstSet メンバ関数
      * BNF定義を元にFIRST集合を求める*/
-    void getFirstSet();
+    virtual std::unordered_set<int32_t>& getFirstSet();
     
     /*getFollowSet メンバ関数
      * BNF定義を元にFOLLOW集合を求める*/
-    void getFollowSet();
+    virtual std::unordered_set<int32_t>& getFollowSet();
   };
   
   /*Arrow クラス

--- a/main.cpp
+++ b/main.cpp
@@ -425,7 +425,13 @@ int main(int argc, char **argv)
   EXPECT(metaphr->nameSpace, "");
   metaphr->setSemanticValue("wpe");
   EXPECT(metaphr->value, "wpe");
+  EXPECT(metaphr->getFirstSet().empty(), true);
+  EXPECT(metaphr->getFollowSet().empty(), true);
+  metaphr->setTokenId((int32_t)jstr::parser::nonterminal::modules_statement);
+  std::unordered_set<int32_t> firstset = metaphr->getFirstSet();
+  EXPECT(firstset.contains((int32_t)jstr::parser::token::CLASS), true);
   delete metaphr;
+  
   jstr::Arrow* arrowphr = new jstr::Arrow("a");
   EXPECT(arrowphr->getId(), "a");
   EXPECT(arrowphr->getDomain(), "#empty");