Ignore:
Timestamp:
May 13, 2024, 7:07:06 AM (6 months ago)
Author:
Peter A. Buhr <pabuhr@…>
Branches:
master
Children:
ca4f2b2
Parents:
ec20ab9 (diff), 5f225f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

fix merge

File:
1 moved

Legend:

Unmodified
Added
Removed
  • src/Parser/ParseNode.hpp

    rec20ab9 rbf4fe05  
    55// file "LICENCE" distributed with Cforall.
    66//
    7 // ParseNode.h --
     7// ParseNode.hpp --
    88//
    99// Author           : Rodolfo G. Esteves
     
    1616#pragma once
    1717
    18 #include <algorithm>               // for move
    19 #include <cassert>                 // for assert, assertf
    20 #include <iosfwd>                  // for ostream
    21 #include <iterator>                // for back_insert_iterator
    22 #include <list>                    // for list
    23 #include <memory>                  // for unique_ptr, pointer_traits
    24 #include <string>                  // for string
     18#include <algorithm>                 // for move
     19#include <cassert>                   // for assert, assertf
     20#include <iosfwd>                    // for ostream
     21#include <iterator>                  // for back_insert_iterator
     22#include <list>                      // for list
     23#include <memory>                    // for unique_ptr, pointer_traits
     24#include <string>                    // for string
    2525
    26 #include "AST/Expr.hpp"            // for Expr, NameExpr LogicalFlag
    27 #include "AST/Fwd.hpp"             // for ptr, Decl, DeclWithType,
    28 #include "AST/Stmt.hpp"            // for Stmt
    29 #include "Common/CodeLocation.h"   // for CodeLocation
    30 #include "Common/SemanticError.h"  // for SemanticError
    31 #include "Common/UniqueName.h"     // for UniqueName
    32 #include "Parser/parserutility.h"  // for maybeBuild, maybeCopy
     26#include "AST/Expr.hpp"              // for Expr, NameExpr, LogicalFlag
     27#include "AST/Fwd.hpp"               // for ptr, Decl, DeclWithType,
     28#include "AST/Stmt.hpp"              // for Stmt
     29#include "Common/CodeLocation.hpp"   // for CodeLocation
     30#include "Common/SemanticError.hpp"  // for SemanticError
     31#include "Common/UniqueName.hpp"     // for UniqueName
     32#include "Parser/ParserUtility.hpp"  // for maybeBuild, maybeCopy
    3333
    3434struct DeclarationNode;
Note: See TracChangeset for help on using the changeset viewer.