Mercurial > hg > GearsTemplate
changeset 54:0299b90256e5
syntax suggest
| author | kkb |
|---|---|
| date | Thu, 11 Jun 2015 17:23:50 +0900 |
| parents | 399ed10d1760 |
| children | 2ff693c5563c c469c5ed5b4d |
| files | doc/synchronizedQueue.graffle src/llrb/llrb.c src/llrb/llrbContext.h |
| diffstat | 3 files changed, 435 insertions(+), 239 deletions(-) [+] |
line wrap: on
line diff
--- a/doc/synchronizedQueue.graffle Thu Jun 11 15:08:38 2015 +0900 +++ b/doc/synchronizedQueue.graffle Thu Jun 11 17:23:50 2015 +0900 @@ -6,26 +6,21 @@ <integer>0</integer> <key>ApplicationVersion</key> <array> - <string>com.omnigroup.OmniGraffle</string> - <string>139.18.0.187838</string> + <string>com.omnigroup.OmniGraffle6</string> + <string>159.11.0.228015</string> </array> <key>AutoAdjust</key> <true/> <key>BackgroundGraphic</key> <dict> <key>Bounds</key> - <string>{{0, 0}, {558.99997329711914, 1566}}</string> + <string>{{0, 0}, {1118, 783}}</string> <key>Class</key> <string>SolidGraphic</string> <key>ID</key> <integer>2</integer> <key>Style</key> <dict> - <key>shadow</key> - <dict> - <key>Draws</key> - <string>NO</string> - </dict> <key>stroke</key> <dict> <key>Draws</key> @@ -46,9 +41,9 @@ <key>Creator</key> <string>Tatsuki IHA</string> <key>DisplayScale</key> - <string>1 0/72 in = 1.0000 in</string> + <string>1 in = 1.00000 in</string> <key>GraphDocumentVersion</key> - <integer>8</integer> + <integer>12</integer> <key>GraphicsList</key> <array> <dict> @@ -65,11 +60,16 @@ <integer>104</integer> <key>Points</key> <array> - <string>{126.99996948242188, 779.5}</string> - <string>{126.49998474121094, 817.875}</string> + <string>{654.31997136771679, 372.25999866425991}</string> + <string>{653.81998662650585, 410.63499866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -92,7 +92,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{70.999984741210938, 817.875}, {111, 42}}</string> + <string>{{598.31998662650585, 410.63499866425991}, {111, 42}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -104,10 +104,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>Color</key> @@ -126,8 +129,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red255\green0\blue0;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -155,6 +158,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -187,10 +195,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>Color</key> @@ -209,8 +220,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red255\green0\blue0;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -226,11 +237,16 @@ <integer>99</integer> <key>Points</key> <array> - <string>{125.99998474121094, 653.25}</string> - <string>{125.99998474121094, 611.5}</string> + <string>{653.31998662650585, 246.00999866425991}</string> + <string>{653.31998662650585, 204.25999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -256,11 +272,16 @@ <integer>98</integer> <key>Points</key> <array> - <string>{126.99996948242188, 737.5}</string> - <string>{126.99996948242188, 695.75}</string> + <string>{654.31997136771679, 330.25999866425991}</string> + <string>{654.31997136771679, 290.50999866425985}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -286,7 +307,7 @@ <array> <dict> <key>Bounds</key> - <string>{{71.499977111816406, 653.25}, {110.99999237060547, 14}}</string> + <string>{{598.81997899711132, 246.00999866425991}, {110.99999237060547, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -295,8 +316,6 @@ <string>Resize</string> <key>ID</key> <integer>96</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -304,12 +323,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -322,7 +346,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{71.499977111816406, 667.25}, {110.99999237060547, 28}}</string> + <string>{{598.81997899711132, 260.00999866425991}, {110.99999237060547, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -331,8 +355,6 @@ <string>Resize</string> <key>ID</key> <integer>97</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -340,14 +362,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -376,11 +403,16 @@ <integer>94</integer> <key>Points</key> <array> - <string>{222.49996948242188, 761.91665649414062}</string> - <string>{182.49996336152327, 761.49998967265196}</string> + <string>{749.81997136771679, 354.67665515840054}</string> + <string>{709.81996524681813, 354.25998833691187}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -396,7 +428,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{71.499969482421875, 737.5}, {111, 42}}</string> + <string>{{598.81997136771679, 330.25999866425991}, {111, 42}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -408,10 +440,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -421,8 +456,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -438,7 +473,7 @@ <array> <dict> <key>Bounds</key> - <string>{{222.49997711181641, 733}, {111, 14}}</string> + <string>{{749.81997899711132, 325.75999866425991}, {111, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -447,8 +482,6 @@ <string>Resize</string> <key>ID</key> <integer>91</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -456,12 +489,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -474,7 +512,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{222.49997711181641, 747}, {111, 28}}</string> + <string>{{749.81997899711132, 339.75999866425991}, {111, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -483,8 +521,6 @@ <string>Resize</string> <key>ID</key> <integer>92</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -492,14 +528,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -533,11 +574,16 @@ <integer>89</integer> <key>Points</key> <array> - <string>{373.99995613098145, 762}</string> - <string>{333.99995001008284, 761.58333317851134}</string> + <string>{901.31995801627636, 354.75999866425991}</string> + <string>{861.31997899711132, 354.75999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -563,11 +609,16 @@ <integer>88</integer> <key>Points</key> <array> - <string>{428.99995613098145, 697.5}</string> - <string>{428.99995613098145, 741}</string> + <string>{956.31995801627636, 290.25999866425991}</string> + <string>{956.31995801627636, 333.75999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -583,7 +634,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{373.99995613098145, 741}, {111, 42}}</string> + <string>{{901.31995801627636, 333.75999866425991}, {111, 42}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -595,10 +646,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -608,8 +662,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -630,11 +684,16 @@ <integer>86</integer> <key>Points</key> <array> - <string>{429.49995613098145, 611}</string> - <string>{429.49995613098145, 654.5}</string> + <string>{956.81995801627636, 203.75999866425991}</string> + <string>{956.81995801627636, 247.25999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -660,7 +719,7 @@ <array> <dict> <key>Bounds</key> - <string>{{373.99997329711914, 655}, {111, 14}}</string> + <string>{{901.31997518241405, 247.75999866425991}, {111, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -669,8 +728,6 @@ <string>Resize</string> <key>ID</key> <integer>84</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -678,12 +735,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -696,7 +758,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{373.99997329711914, 669}, {111, 28}}</string> + <string>{{901.31997518241405, 261.75999866425991}, {111, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -705,8 +767,6 @@ <string>Resize</string> <key>ID</key> <integer>85</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -714,14 +774,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -745,7 +810,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{519.5, 627}, {33, 14}}</string> + <string>{{1046.8200018852949, 219.75999866425991}, {33, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -754,8 +819,6 @@ <string>Resize</string> <key>ID</key> <integer>82</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -777,8 +840,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -789,7 +852,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{107.49998474121094, 467}, {38, 14}}</string> + <string>{{634.81998662650585, 59.759998664259911}, {38, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -798,8 +861,6 @@ <string>Resize</string> <key>ID</key> <integer>81</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -821,8 +882,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -838,11 +899,16 @@ <integer>80</integer> <key>Points</key> <array> - <string>{484.99995613098145, 590}</string> - <string>{522.5, 589}</string> + <string>{1012.3199580162764, 182.75999866425991}</string> + <string>{1049.8200018852949, 181.75999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -870,7 +936,7 @@ <array> <dict> <key>Bounds</key> - <string>{{525.49998664855957, 579.5}, {21, 21}}</string> + <string>{{1052.8199885338545, 172.25999866425991}, {21, 21}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -900,7 +966,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{520.99998664855957, 575}, {30, 30}}</string> + <string>{{1048.3199885338545, 167.75999866425991}, {30, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -908,7 +974,13 @@ <key>Shape</key> <string>Circle</string> <key>Style</key> - <dict/> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> </dict> </array> <key>ID</key> @@ -916,7 +988,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{373.99995613098145, 569}, {111, 42}}</string> + <string>{{901.31995801627636, 161.75999866425991}, {111, 42}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -928,10 +1000,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -941,8 +1016,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -958,11 +1033,16 @@ <integer>75</integer> <key>Points</key> <array> - <string>{333.99991289730917, 590.12953473804851}</string> - <string>{374.49998664855957, 589.5}</string> + <string>{861.31991478906843, 182.88953340220792}</string> + <string>{901.81998853385448, 182.25999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -988,7 +1068,7 @@ <array> <dict> <key>Bounds</key> - <string>{{222.49997329711914, 549}, {111, 14}}</string> + <string>{{749.81997518241405, 141.75999866425991}, {111, 14}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -997,8 +1077,6 @@ <string>Resize</string> <key>ID</key> <integer>73</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1006,12 +1084,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1024,7 +1107,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{222.49997329711914, 563}, {111, 56}}</string> + <string>{{749.81997518241405, 155.75999866425991}, {111, 56}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -1033,8 +1116,6 @@ <string>Resize</string> <key>ID</key> <integer>74</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1042,14 +1123,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -1085,11 +1171,16 @@ <integer>71</integer> <key>Points</key> <array> - <string>{181.99998664855957, 590}</string> - <string>{222.00000039884759, 590.41666686784777}</string> + <string>{709.31998853385448, 182.75999866425991}</string> + <string>{749.3200023069503, 183.17666553234531}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1122,11 +1213,16 @@ <integer>70</integer> <key>Points</key> <array> - <string>{127.04228643780414, 515}</string> - <string>{126.49998664855957, 569}</string> + <string>{654.36228832309905, 107.75999866425991}</string> + <string>{653.81998853385448, 161.75999866425991}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1142,7 +1238,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{70.99998664855957, 569}, {111, 42}}</string> + <string>{{598.31998853385448, 161.75999866425991}, {111, 42}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -1154,10 +1250,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -1167,8 +1266,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1179,7 +1278,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{115.99998664855957, 494}, {21, 21}}</string> + <string>{{643.31998853385448, 86.759998664259911}, {21, 21}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>ID</key> @@ -1219,6 +1318,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1245,10 +1349,15 @@ <key>Points</key> <array> <string>{128.49996948242188, 324.5}</string> - <string>{128.49996948242188, 282.75}</string> + <string>{128.49996948242188, 284.75}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1283,8 +1392,6 @@ <string>Resize</string> <key>ID</key> <integer>64</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1292,12 +1399,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1310,7 +1422,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{72.999977111816406, 254.25}, {111, 28}}</string> + <string>{{72.999977111816406, 254.25}, {111, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -1319,8 +1431,6 @@ <string>Resize</string> <key>ID</key> <integer>65</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1328,14 +1438,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -1369,6 +1484,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1396,10 +1516,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -1409,8 +1532,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1435,8 +1558,6 @@ <string>Resize</string> <key>ID</key> <integer>57</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1444,12 +1565,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1462,7 +1588,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{223.99997711181641, 334}, {111, 28}}</string> + <string>{{223.99997711181641, 334}, {111, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -1471,8 +1597,6 @@ <string>Resize</string> <key>ID</key> <integer>59</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1480,14 +1604,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -1522,10 +1651,15 @@ <key>Points</key> <array> <string>{375.49995613098145, 349}</string> - <string>{335.49995001008284, 348.58333317851128}</string> + <string>{335.49997711181641, 349}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1556,6 +1690,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1583,10 +1722,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -1596,8 +1738,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1623,6 +1765,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1657,8 +1804,6 @@ <string>Resize</string> <key>ID</key> <integer>50</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1666,12 +1811,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1684,7 +1834,7 @@ </dict> <dict> <key>Bounds</key> - <string>{{375.49997329711914, 256}, {111, 28}}</string> + <string>{{375.49997329711914, 256}, {111, 30}}</string> <key>Class</key> <string>ShapedGraphic</string> <key>FitText</key> @@ -1693,8 +1843,6 @@ <string>Resize</string> <key>ID</key> <integer>51</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1702,14 +1850,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -1742,8 +1895,6 @@ <string>Resize</string> <key>ID</key> <integer>6</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1765,8 +1916,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1786,8 +1937,6 @@ <string>Resize</string> <key>ID</key> <integer>5</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1809,8 +1958,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1831,6 +1980,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1896,7 +2050,13 @@ <key>Shape</key> <string>Circle</string> <key>Style</key> - <dict/> + <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> + </dict> </dict> </array> <key>ID</key> @@ -1916,10 +2076,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -1929,8 +2092,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -1946,11 +2109,16 @@ <integer>36</integer> <key>Points</key> <array> - <string>{335.49991289730917, 177.12953473804851}</string> + <string>{335.49991290377352, 177.12953473794801}</string> <string>{375.99998664855957, 176.5}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -1985,8 +2153,6 @@ <string>Resize</string> <key>ID</key> <integer>34</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -1994,12 +2160,17 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -2021,8 +2192,6 @@ <string>Resize</string> <key>ID</key> <integer>35</integer> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> <key>fill</key> @@ -2030,14 +2199,19 @@ <key>GradientCenter</key> <string>{-0.29411799999999999, -0.264706}</string> </dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> </dict> <key>Text</key> <dict> <key>Align</key> <integer>0</integer> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720 @@ -2074,10 +2248,15 @@ <key>Points</key> <array> <string>{183.49998664855957, 177}</string> - <string>{223.50000039884759, 177.41666686784782}</string> + <string>{223.50000042165541, 177.4166668680854}</string> </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -2115,6 +2294,11 @@ </array> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>HeadArrow</key> @@ -2142,10 +2326,13 @@ <string>{1, 0}</string> <string>{-1, 0}</string> </array> - <key>Shape</key> - <string>Rectangle</string> <key>Style</key> <dict> + <key>shadow</key> + <dict> + <key>Draws</key> + <string>NO</string> + </dict> <key>stroke</key> <dict> <key>CornerRadius</key> @@ -2155,8 +2342,8 @@ <key>Text</key> <dict> <key>Text</key> - <string>{\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570 -\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;} + <string>{\rtf1\ansi\ansicpg65001\cocoartf1344\cocoasubrtf720 +{\fonttbl\f0\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;} \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720\qc @@ -2203,7 +2390,7 @@ <key>GuidesVisible</key> <string>YES</string> <key>HPages</key> - <integer>1</integer> + <integer>2</integer> <key>ImageCounter</key> <integer>1</integer> <key>KeepToScale</key> @@ -2231,6 +2418,8 @@ <real>0.0</real> <key>layoutEngine</key> <string>dot</string> + <key>neatoLineLength</key> + <real>0.20000000298023224</real> <key>neatoSeparation</key> <real>0.0</real> <key>twopiSeparation</key> @@ -2243,9 +2432,9 @@ <key>MasterSheets</key> <array/> <key>ModificationDate</key> - <string>2015-05-04 08:36:28 +0000</string> + <string>2015-05-24 17:35:18 +0000</string> <key>Modifier</key> - <string>Tatsuki IHA</string> + <string>one</string> <key>NotesVisible</key> <string>NO</string> <key>Orientation</key> @@ -2274,12 +2463,12 @@ <key>NSPaperSize</key> <array> <string>size</string> - <string>{594.99997329711914, 842}</string> + <string>{595, 842}</string> </array> <key>NSPrintReverseOrientation</key> <array> - <string>int</string> - <string>0</string> + <string>coded</string> + <string>BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG</string> </array> <key>NSRightMargin</key> <array> @@ -2311,34 +2500,27 @@ <key>UseEntirePage</key> <false/> <key>VPages</key> - <integer>2</integer> + <integer>1</integer> <key>WindowInfo</key> <dict> <key>CurrentSheet</key> <integer>0</integer> - <key>ExpandedCanvases</key> - <array> - <dict> - <key>name</key> - <string>sender receiver</string> - </dict> - </array> + <key>Expanded_Canvases</key> + <array/> <key>Frame</key> - <string>{{615, 0}, {1029, 925}}</string> - <key>ListView</key> + <string>{{597, 594}, {1325, 925}}</string> + <key>ShowInfo</key> <true/> - <key>OutlineWidth</key> - <integer>142</integer> - <key>RightSidebar</key> - <false/> <key>ShowRuler</key> <true/> <key>Sidebar</key> <true/> <key>SidebarWidth</key> - <integer>120</integer> + <integer>200</integer> + <key>TopSlabHeight</key> + <real>250</real> <key>VisibleRegion</key> - <string>{{-168, 9.5}, {894, 783}}</string> + <string>{{248, 15}, {811, 768}}</string> <key>Zoom</key> <real>1</real> <key>ZoomValues</key>
--- a/src/llrb/llrb.c Thu Jun 11 15:08:38 2015 +0900 +++ b/src/llrb/llrb.c Thu Jun 11 17:23:50 2015 +0900 @@ -44,10 +44,14 @@ } } +__code meta_code1_before(struct Context* context) { + goto code1(context, &context->data[Allocate]->allocate); +} + __code code1(struct Context* context, struct Allocate *allocate) { - allocate->size = sizeof(long); + allocate->size = sizeof(struct Count); allocate->next = Code2; - goto meta(context, Allocator); + goto meta(context, Allocater); } /* __code code1(struct Context* context) { */ @@ -56,23 +60,38 @@ /* goto meta(context, Allocator); */ /* } */ +/* +__code code2(Allocate allocate, Count count) { + count.count = 0; + goto code3(count); +} +*/ + +__code code2_stub(struct Context* context) { + goto code2(context, &context->data[context->dataNum]->count); +} + +__code code2(struct Context* context, struct Count* count) { + count->i = 1; + goto meta(context, Code3); +} + __code meta(struct Context* context, enum Code next) { - if (next == Code1) - goto code1(context, &context->data[Allocate]->allocate); - goto (context->code[next])(context); } -__code put(struct Context* context) { - struct Tree* tree = &context->data[Tree]->tree; - context->data[Next]->next = context->data[Allocate]->allocate.next; - +__code put_stub(struct Context* context) { + goto put(context, &context->data[Tree]->tree, &context->data[Allocate]->allocate); +} + +__code put(struct Context* context, struct Tree* tree, struct Allocate* allocate) { + allocate->size = sizeof(struct Node); if (tree->root == 0) { - context->data[Allocate]->allocate.next = Insert; + allocate->next = Insert; goto meta(context, Allocator); } - context->data[Allocate]->allocate.next = Create; + allocate->next = Create; tree->current = tree->root; goto meta(context, Compare); @@ -263,37 +282,22 @@ goto meta(context, Get); } -/* -__code code2(Allocate allocate, Count count) { - count.count = 0; - goto code3(count); -} -*/ - -__code code2(struct Context* context) { - context->data[4]->count = 1; - goto meta(context, Code3); +__code meta_code3_before(struct Context* context) { + goto code3(context, &context->data[Node]->node, &context->data[4]->count); } -__code code3(struct Context* context) { - struct Allocate* allocate = &context->data[Allocate]->allocate; - struct Node* node = &context->data[Node]->node; - long loop = context->data[4]->count; - - if (loop == num) { +__code code3(struct Context* context, struct Node* node, struct Count* count) { + if (count->i == num) { goto meta(context, Code4); } - allocate->size = sizeof(struct Node); - allocate->next = Code3; - + node->next = Code3; node->key = loop; node->value = loop; - context->data[4]->count++; + count->i++; goto meta(context, Put); } - __code code4(struct Context* context) { puts("---before---"); print_tree(context->data[Tree]->tree.root, 0);
--- a/src/llrb/llrbContext.h Thu Jun 11 15:08:38 2015 +0900 +++ b/src/llrb/llrbContext.h Thu Jun 11 17:23:50 2015 +0900 @@ -33,26 +33,36 @@ }; struct Context { + enum Code *next; + int current; int codeNum; __code (**code) (struct Context*); - void* heap_start; + void* heapStart; void* heap; - long dataSize; + long heapLimit; int dataNum; union Data **data; }; union Data { - long count; - enum Code next; + struct Comparable { // inteface + enum Code compare; + union Data* data; + } + struct Count { + enum Code next; + long count; + } count; struct Tree { + enum Code next; struct Node* root; struct Node* current; struct Node* prev; int result; } tree; struct Node { - int key; + enum Code next; + int key; // comparable data segment int value; enum Color { Red, @@ -62,7 +72,7 @@ struct Node* right; } node; struct Allocate { + enum Code next; long size; - enum Code next; } allocate; };