equal
deleted
inserted
replaced
19 |
19 |
20 |
20 |
21 object Token_Markup |
21 object Token_Markup |
22 { |
22 { |
23 /* line context */ |
23 /* line context */ |
|
24 |
|
25 def mode_rule_set(mode: String): ParserRuleSet = |
|
26 new ParserRuleSet(mode, "MAIN") |
24 |
27 |
25 object Line_Context |
28 object Line_Context |
26 { |
29 { |
27 def init(mode: String): Line_Context = |
30 def init(mode: String): Line_Context = |
28 new Line_Context(mode, Some(Scan.Finished), Line_Structure.init) |
31 new Line_Context(mode, Some(Scan.Finished), Line_Structure.init) |
48 |
51 |
49 class Line_Context( |
52 class Line_Context( |
50 val mode: String, |
53 val mode: String, |
51 val context: Option[Scan.Line_Context], |
54 val context: Option[Scan.Line_Context], |
52 val structure: Line_Structure) |
55 val structure: Line_Structure) |
53 extends TokenMarker.LineContext(new ParserRuleSet(mode, "MAIN"), null) |
56 extends TokenMarker.LineContext(mode_rule_set(mode), null) |
54 { |
57 { |
55 def get_context: Scan.Line_Context = context.getOrElse(Scan.Finished) |
58 def get_context: Scan.Line_Context = context.getOrElse(Scan.Finished) |
56 |
59 |
57 override def hashCode: Int = (mode, context, structure).hashCode |
60 override def hashCode: Int = (mode, context, structure).hashCode |
58 override def equals(that: Any): Boolean = |
61 override def equals(that: Any): Boolean = |
214 |
217 |
215 class Marker( |
218 class Marker( |
216 protected val mode: String, |
219 protected val mode: String, |
217 protected val opt_buffer: Option[Buffer]) extends TokenMarker |
220 protected val opt_buffer: Option[Buffer]) extends TokenMarker |
218 { |
221 { |
|
222 addRuleSet(mode_rule_set(mode)) |
|
223 |
219 override def hashCode: Int = (mode, opt_buffer).hashCode |
224 override def hashCode: Int = (mode, opt_buffer).hashCode |
220 override def equals(that: Any): Boolean = |
225 override def equals(that: Any): Boolean = |
221 that match { |
226 that match { |
222 case other: Marker => mode == other.mode && opt_buffer == other.opt_buffer |
227 case other: Marker => mode == other.mode && opt_buffer == other.opt_buffer |
223 case _ => false |
228 case _ => false |