Differences From Artifact [475bb9a37e]:

• File s_container.tcl — part of check-in [fba7f2ccdc] at 2017-05-11 06:15:02 on branch new-slif-semantics — Implemented grammar container deserialization (bulk load). Fixed issue in serialization (empty container) Extended testsuite. (user: aku size: 2838)

To Artifact [bed180cec4]:

• File s_container.tcl — part of check-in [bc099e52e4] at 2017-05-17 20:02:50 on branch new-slif-semantics — Implemented basic container validation. As part of that added some plumbing so that the objects internal to the container have a reference to their collection (container, or grammar, depending on context). Needed as some validations have to reach from the location perf,orming them to other parts of the system to get associated data. Extended the testsuites to invoke the validator (result of ctrace -> gcstate, ser/des, reductrion results). Pleased that all of them are good. Related things, to do: Checks for inacessible symbols, non-generating symbols (not reaching terminals/atoms), removal of same. Further to do, rewriting of precedenced priority rules to non-precedenced form. (user: aku size: 3051)

26
27
28
29
30
31
32


33
34
35
36
37
38
39
40
41
42
43
44
45
46
47

oo::class create marpa::slif::container {
    superclass marpa::slif::container::serdes

    marpa::E marpa/slif/container SLIF CONTAINER

    constructor {} {
	debug.marpa/slif/container {}



	# Attributes, global and lexeme semantics
	marpa::slif::container::attribute::global create GA [self]
	marpa::slif::container::attribute::lexsem create LS

	# Grammars for the two levels.
	marpa::slif::container::grammar::g1 create G1
	marpa::slif::container::grammar::l0 create L0

	# TODO? semstore, used as a string pool
	debug.marpa/slif/container {/ok}
	return
    }

    # # -- --- ----- -------- -------------

>
>



|


|
|

26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49

oo::class create marpa::slif::container {
    superclass marpa::slif::container::serdes

    marpa::E marpa/slif/container SLIF CONTAINER

    constructor {} {
	debug.marpa/slif/container {}
	# Note, all subordinate objects get a reference back to the
	# container they are a part of.

	# Attributes, global and lexeme semantics
	marpa::slif::container::attribute::global create GA [self]
	marpa::slif::container::attribute::lexsem create LS [self]

	# Grammars for the two levels.
	marpa::slif::container::grammar::g1 create G1 [self]
	marpa::slif::container::grammar::l0 create L0 [self]

	# TODO? semstore, used as a string pool
	debug.marpa/slif/container {/ok}
	return
    }

    # # -- --- ----- -------- -------------

94
95
96
97
98
99
100


101





102
103
104
105
106
107
108
109
110

	    $part clear
	    if {![dict exists $blob $label]} continue
	    $part deserialize [dict get $blob $label]
	}
	return
    }



    # TODO: Validation.






    # # -- --- ----- -------- -------------
    ## Internal methods

    # # ## ### ##### ######## #############
}

# # ## ### ##### ######## #############
return

>
>
|
>
>
>
>
>

96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119

	    $part clear
	    if {![dict exists $blob $label]} continue
	    $part deserialize [dict get $blob $label]
	}
	return
    }

    method validate {} {
	debug.marpa/slif/container {}
	LS validate
	G1 validate
	L0 validate
	GA validate
	return
    }

    # # -- --- ----- -------- -------------
    ## Internal methods

    # # ## ### ##### ######## #############
}

# # ## ### ##### ######## #############
return