[PP] Ifdef ifndef

WasmVM · Mar 16, 2024 · b1bdab1 · b1bdab1
1 parent a0cdf96
commit b1bdab1
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 46 deletions.
diff --git a/src/include/PreProcessor.hpp b/src/include/PreProcessor.hpp
@@ -114,11 +114,11 @@ struct PreProcessor {
     bool evaluate_condition();
     bool readline();
     void defined_operator();
+    void jump_else();
 
     void define_directive();
     void if_directive();
-    // void ifdef_directive();
-    // void ifndef_directive();
+    void ifdef_ifndef_directive(bool if_def = true);
     void else_directive();
     // void undef_directive(PPToken& token); // TODO:
     // void pragma_directive(PPToken& token); // TODO:

diff --git a/src/lib/PreProcessor/PreProcessor.cpp b/src/lib/PreProcessor/PreProcessor.cpp
@@ -89,9 +89,9 @@ PreProcessor::PPToken PreProcessor::get(){
                     replace_macro(line, macros, true);
                     if_directive();
                 }else if(direcitve_name == "ifdef"){
-                    // TODO:
+                    ifdef_ifndef_directive(true);
                 }else if(direcitve_name == "ifndef"){
-                    // TODO:
+                    ifdef_ifndef_directive(false);
                 }else if(direcitve_name == "elif"){
                     if_level -= 1;
                     if(if_level < 0){
@@ -201,6 +201,50 @@ void PreProcessor::defined_operator(){
     }
 }
 
+void PreProcessor::jump_else(){
+    size_t nest_level = 0;
+    while(readline()){
+        if(line.type == Line::Directive){
+            Line::iterator cur = skip_whitespace(std::next(line.begin()), line.end());
+            if(cur != line.end() && cur->hold<TokenType::Identifier>()){
+                std::string direcitve_name = ((TokenType::Identifier)cur->value()).sequence;
+                line.erase(line.begin(), std::next(cur));
+                if(direcitve_name == "if"){
+                    nest_level += 1;
+                }else if((direcitve_name == "endif") || (direcitve_name == "else") || (direcitve_name == "elif")){
+                    if(nest_level == 0){
+                        if(direcitve_name == "elif"){
+                            defined_operator();
+                            // replace identifier with 0
+                            for(PPToken& token : line){
+                                if(token.hold<TokenType::Identifier>()){
+                                    token.emplace(Token(TokenType::PPNumber("0")));
+                                }
+                            }
+                            if(evaluate_condition()){
+                                if_level += 1;
+                                return;
+                            }else{
+                                continue;
+                            }
+                        }
+                        if(!line.empty()){
+                            Exception::Warning("extra tokens at end of #endif or #else directive");
+                        }
+                        if(direcitve_name == "else"){
+                            if_level += 1;
+                        }
+                        return;
+                    }
+                    if(direcitve_name == "endif"){
+                        nest_level -= 1;
+                    }
+                }
+            }
+        }
+    }
+}
+
 void PreProcessor::if_directive(){
     // defined operator
     defined_operator();
@@ -213,48 +257,7 @@ void PreProcessor::if_directive(){
     if(evaluate_condition()){
         if_level += 1;
     }else{
-        // Jump to else or end
-        size_t nest_level = 0;
-        while(readline()){
-            if(line.type == Line::Directive){
-                Line::iterator cur = skip_whitespace(std::next(line.begin()), line.end());
-                if(cur != line.end() && cur->hold<TokenType::Identifier>()){
-                    std::string direcitve_name = ((TokenType::Identifier)cur->value()).sequence;
-                    line.erase(line.begin(), std::next(cur));
-                    if(direcitve_name == "if"){
-                        nest_level += 1;
-                    }else if((direcitve_name == "endif") || (direcitve_name == "else") || (direcitve_name == "elif")){
-                        if(nest_level == 0){
-                            if(direcitve_name == "elif"){
-                                defined_operator();
-                                // replace identifier with 0
-                                for(PPToken& token : line){
-                                    if(token.hold<TokenType::Identifier>()){
-                                        token.emplace(Token(TokenType::PPNumber("0")));
-                                    }
-                                }
-                                if(evaluate_condition()){
-                                    if_level += 1;
-                                    return;
-                                }else{
-                                    continue;
-                                }
-                            }
-                            if(!line.empty()){
-                                Exception::Warning("extra tokens at end of #endif or #else directive");
-                            }
-                            if(direcitve_name == "else"){
-                                if_level += 1;
-                            }
-                            return;
-                        }
-                        if(direcitve_name == "endif"){
-                            nest_level -= 1;
-                        }
-                    }
-                }
-            }
-        }
+        jump_else();
     }
 }
 
@@ -283,3 +286,17 @@ void PreProcessor::else_directive(){
         }
     }
 }
+
+void PreProcessor::ifdef_ifndef_directive(bool if_def){
+    Line::iterator cur = skip_whitespace(line.begin(), line.end());
+    if(cur != line.end() && cur->hold<TokenType::Identifier>()){
+        std::string macro_name = ((TokenType::Identifier)cur->value()).sequence;
+        if(macros.contains(macro_name) ^ if_def){
+            jump_else();
+        }else{
+            if_level += 1;
+        }
+    }else{
+        throw Exception::Exception("expected identifier in #ifdef or #ifndef");
+    }
+}