Goose  Diff

Differences From Artifact [45de162bdc]:

  • File bs/parse/rule-helpers.cpp — part of check-in [5aab57179e] at 2019-01-22 22:46:29 on branch trunk — Builtins: implemented the comma operator. (user: achavasse size: 970)

To Artifact [fc30f5e0e6]:

  • File bs/parse/rule-helpers.cpp — part of check-in [58cc4d39e9] at 2019-01-24 14:32:22 on branch trunk — Refactored c++ <-> value conversions into a centralized api that can be invoked through generic code. This will be needed to wrap native compile-time functions. (user: achavasse size: 1069)

1
2
3
4
5
6

7
8

9
10
11
12
13
14

15
16
17


18
19
20

21
22

23
24
25
26
27

28
29




30
31
32

33
34
35
36
1
2
3
4
5

6
7

8
9
10
11
12
13

14
15


16
17
18
19

20
21

22
23
24
25
26

27
28

29
30
31
32
33
34

35
36
37
38
39





-
+

-
+





-
+

-
-
+
+


-
+

-
+




-
+

-
+
+
+
+


-
+




#include "parse.h"

using namespace empathy;
using namespace empathy::parse;

namespace empathy::parse
namespace empathy::ir
{
    const Term& RuleType()
    const Term& Bridge< parse::Rule >::Type()
    {
        static auto type = ValueToIRExpr( Value( TSID( type ), TSID( rule ) ) );
        return type;
    }

    Value RuleToValue( Rule&& r )
    Value Bridge< parse::Rule >::ToValue( parse::Rule&& r )
    {
        ptr< void > prule = make_shared< Rule >( move( r ) );
        return Value( RuleType(), TERM( move( prule ) ) );
        ptr< void > prule = make_shared< parse::Rule >( move( r ) );
        return Value( Type(), TERM( move( prule ) ) );
    }

    ptr< Rule > RuleFromValue( const Value& v )
    ptr< parse::Rule > Bridge< parse::Rule >::FromValue( const Value& v )
    {
        if( v.type() != RuleType() )
        if( v.type() != Type() )
            return nullptr;

        const auto& content = v.val().content();
        const auto& p = get< ptr< void > >( content );
        return static_pointer_cast< Rule >( p );
        return static_pointer_cast< parse::Rule >( p );
    }

}

namespace empathy::parse
{
    void RegisterRule( sema::Env& env, const StringId& name, Rule&& rule )
    {
        auto ruleVal = RuleToValue( move( rule ) );
        auto ruleVal = ToValue( move( rule ) );
        auto ruleTerm = ValueToIRExpr( ruleVal );
        env.storeValue( TVEC( TSID( e0 ), TERM( name ) ), ANYTERM( x ), ruleTerm );
    }
}