diff options
Diffstat (limited to 'generator/part.h')
-rw-r--r-- | generator/part.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/generator/part.h b/generator/part.h index 39ba1e7..01791f5 100644 --- a/generator/part.h +++ b/generator/part.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #include <string> | 4 | #include <string> |
5 | #include <set> | 5 | #include <set> |
6 | #include "../lib/selrestr.h" | ||
7 | #include "../lib/enums.h" | 6 | #include "../lib/enums.h" |
8 | 7 | ||
9 | namespace verbly { | 8 | namespace verbly { |
@@ -17,7 +16,7 @@ namespace verbly { | |||
17 | 16 | ||
18 | // Static factories | 17 | // Static factories |
19 | 18 | ||
20 | static part createNounPhrase(std::string role, selrestr selrestrs, std::set<std::string> synrestrs); | 19 | static part createNounPhrase(std::string role, std::set<std::string> selrestrs, std::set<std::string> synrestrs); |
21 | 20 | ||
22 | static part createVerb(); | 21 | static part createVerb(); |
23 | 22 | ||
@@ -67,7 +66,7 @@ namespace verbly { | |||
67 | 66 | ||
68 | std::string getNounRole() const; | 67 | std::string getNounRole() const; |
69 | 68 | ||
70 | selrestr getNounSelrestrs() const; | 69 | std::set<std::string> getNounSelrestrs() const; |
71 | 70 | ||
72 | std::set<std::string> getNounSynrestrs() const; | 71 | std::set<std::string> getNounSynrestrs() const; |
73 | 72 | ||
@@ -104,7 +103,7 @@ namespace verbly { | |||
104 | union { | 103 | union { |
105 | struct { | 104 | struct { |
106 | std::string role; | 105 | std::string role; |
107 | selrestr selrestrs; | 106 | std::set<std::string> selrestrs; |
108 | std::set<std::string> synrestrs; | 107 | std::set<std::string> synrestrs; |
109 | } noun_phrase_; | 108 | } noun_phrase_; |
110 | struct { | 109 | struct { |