# HG changeset patch
# User kkb
# Date 1434011030 -32400
# Node ID 0299b90256e5671b9ea513b4121f90a223e610fc
# Parent 399ed10d1760bc37984dfb8382ff0460a92fb76a
syntax suggest
diff -r 399ed10d1760 -r 0299b90256e5 doc/synchronizedQueue.graffle
--- 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 @@
0
ApplicationVersion
- com.omnigroup.OmniGraffle
- 139.18.0.187838
+ com.omnigroup.OmniGraffle6
+ 159.11.0.228015
AutoAdjust
BackgroundGraphic
Bounds
- {{0, 0}, {558.99997329711914, 1566}}
+ {{0, 0}, {1118, 783}}
Class
SolidGraphic
ID
2
Style
- shadow
-
- Draws
- NO
-
stroke
Draws
@@ -46,9 +41,9 @@
Creator
Tatsuki IHA
DisplayScale
- 1 0/72 in = 1.0000 in
+ 1 in = 1.00000 in
GraphDocumentVersion
- 8
+ 12
GraphicsList
@@ -65,11 +60,16 @@
104
Points
- {126.99996948242188, 779.5}
- {126.49998474121094, 817.875}
+ {654.31997136771679, 372.25999866425991}
+ {653.81998662650585, 410.63499866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -92,7 +92,7 @@
Bounds
- {{70.999984741210938, 817.875}, {111, 42}}
+ {{598.31998662650585, 410.63499866425991}, {111, 42}}
Class
ShapedGraphic
ID
@@ -104,10 +104,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
Color
@@ -126,8 +129,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -187,10 +195,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
Color
@@ -209,8 +220,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
99
Points
- {125.99998474121094, 653.25}
- {125.99998474121094, 611.5}
+ {653.31998662650585, 246.00999866425991}
+ {653.31998662650585, 204.25999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -256,11 +272,16 @@
98
Points
- {126.99996948242188, 737.5}
- {126.99996948242188, 695.75}
+ {654.31997136771679, 330.25999866425991}
+ {654.31997136771679, 290.50999866425985}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -286,7 +307,7 @@
Bounds
- {{71.499977111816406, 653.25}, {110.99999237060547, 14}}
+ {{598.81997899711132, 246.00999866425991}, {110.99999237060547, 14}}
Class
ShapedGraphic
FitText
@@ -295,8 +316,6 @@
Resize
ID
96
- Shape
- Rectangle
Style
fill
@@ -304,12 +323,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{71.499977111816406, 667.25}, {110.99999237060547, 28}}
+ {{598.81997899711132, 260.00999866425991}, {110.99999237060547, 30}}
Class
ShapedGraphic
FitText
@@ -331,8 +355,6 @@
Resize
ID
97
- Shape
- Rectangle
Style
fill
@@ -340,14 +362,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
94
Points
- {222.49996948242188, 761.91665649414062}
- {182.49996336152327, 761.49998967265196}
+ {749.81997136771679, 354.67665515840054}
+ {709.81996524681813, 354.25998833691187}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -396,7 +428,7 @@
Bounds
- {{71.499969482421875, 737.5}, {111, 42}}
+ {{598.81997136771679, 330.25999866425991}, {111, 42}}
Class
ShapedGraphic
ID
@@ -408,10 +440,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -421,8 +456,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{222.49997711181641, 733}, {111, 14}}
+ {{749.81997899711132, 325.75999866425991}, {111, 14}}
Class
ShapedGraphic
FitText
@@ -447,8 +482,6 @@
Resize
ID
91
- Shape
- Rectangle
Style
fill
@@ -456,12 +489,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{222.49997711181641, 747}, {111, 28}}
+ {{749.81997899711132, 339.75999866425991}, {111, 30}}
Class
ShapedGraphic
FitText
@@ -483,8 +521,6 @@
Resize
ID
92
- Shape
- Rectangle
Style
fill
@@ -492,14 +528,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
89
Points
- {373.99995613098145, 762}
- {333.99995001008284, 761.58333317851134}
+ {901.31995801627636, 354.75999866425991}
+ {861.31997899711132, 354.75999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -563,11 +609,16 @@
88
Points
- {428.99995613098145, 697.5}
- {428.99995613098145, 741}
+ {956.31995801627636, 290.25999866425991}
+ {956.31995801627636, 333.75999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -583,7 +634,7 @@
Bounds
- {{373.99995613098145, 741}, {111, 42}}
+ {{901.31995801627636, 333.75999866425991}, {111, 42}}
Class
ShapedGraphic
ID
@@ -595,10 +646,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -608,8 +662,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
86
Points
- {429.49995613098145, 611}
- {429.49995613098145, 654.5}
+ {956.81995801627636, 203.75999866425991}
+ {956.81995801627636, 247.25999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -660,7 +719,7 @@
Bounds
- {{373.99997329711914, 655}, {111, 14}}
+ {{901.31997518241405, 247.75999866425991}, {111, 14}}
Class
ShapedGraphic
FitText
@@ -669,8 +728,6 @@
Resize
ID
84
- Shape
- Rectangle
Style
fill
@@ -678,12 +735,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{373.99997329711914, 669}, {111, 28}}
+ {{901.31997518241405, 261.75999866425991}, {111, 30}}
Class
ShapedGraphic
FitText
@@ -705,8 +767,6 @@
Resize
ID
85
- Shape
- Rectangle
Style
fill
@@ -714,14 +774,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{519.5, 627}, {33, 14}}
+ {{1046.8200018852949, 219.75999866425991}, {33, 14}}
Class
ShapedGraphic
FitText
@@ -754,8 +819,6 @@
Resize
ID
82
- Shape
- Rectangle
Style
fill
@@ -777,8 +840,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{107.49998474121094, 467}, {38, 14}}
+ {{634.81998662650585, 59.759998664259911}, {38, 14}}
Class
ShapedGraphic
FitText
@@ -798,8 +861,6 @@
Resize
ID
81
- Shape
- Rectangle
Style
fill
@@ -821,8 +882,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
80
Points
- {484.99995613098145, 590}
- {522.5, 589}
+ {1012.3199580162764, 182.75999866425991}
+ {1049.8200018852949, 181.75999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -870,7 +936,7 @@
Bounds
- {{525.49998664855957, 579.5}, {21, 21}}
+ {{1052.8199885338545, 172.25999866425991}, {21, 21}}
Class
ShapedGraphic
ID
@@ -900,7 +966,7 @@
Bounds
- {{520.99998664855957, 575}, {30, 30}}
+ {{1048.3199885338545, 167.75999866425991}, {30, 30}}
Class
ShapedGraphic
ID
@@ -908,7 +974,13 @@
Shape
Circle
Style
-
+
+ shadow
+
+ Draws
+ NO
+
+
ID
@@ -916,7 +988,7 @@
Bounds
- {{373.99995613098145, 569}, {111, 42}}
+ {{901.31995801627636, 161.75999866425991}, {111, 42}}
Class
ShapedGraphic
ID
@@ -928,10 +1000,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -941,8 +1016,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
75
Points
- {333.99991289730917, 590.12953473804851}
- {374.49998664855957, 589.5}
+ {861.31991478906843, 182.88953340220792}
+ {901.81998853385448, 182.25999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -988,7 +1068,7 @@
Bounds
- {{222.49997329711914, 549}, {111, 14}}
+ {{749.81997518241405, 141.75999866425991}, {111, 14}}
Class
ShapedGraphic
FitText
@@ -997,8 +1077,6 @@
Resize
ID
73
- Shape
- Rectangle
Style
fill
@@ -1006,12 +1084,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{222.49997329711914, 563}, {111, 56}}
+ {{749.81997518241405, 155.75999866425991}, {111, 56}}
Class
ShapedGraphic
FitText
@@ -1033,8 +1116,6 @@
Resize
ID
74
- Shape
- Rectangle
Style
fill
@@ -1042,14 +1123,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
71
Points
- {181.99998664855957, 590}
- {222.00000039884759, 590.41666686784777}
+ {709.31998853385448, 182.75999866425991}
+ {749.3200023069503, 183.17666553234531}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1122,11 +1213,16 @@
70
Points
- {127.04228643780414, 515}
- {126.49998664855957, 569}
+ {654.36228832309905, 107.75999866425991}
+ {653.81998853385448, 161.75999866425991}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1142,7 +1238,7 @@
Bounds
- {{70.99998664855957, 569}, {111, 42}}
+ {{598.31998853385448, 161.75999866425991}, {111, 42}}
Class
ShapedGraphic
ID
@@ -1154,10 +1250,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -1167,8 +1266,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{115.99998664855957, 494}, {21, 21}}
+ {{643.31998853385448, 86.759998664259911}, {21, 21}}
Class
ShapedGraphic
ID
@@ -1219,6 +1318,11 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1245,10 +1349,15 @@
Points
{128.49996948242188, 324.5}
- {128.49996948242188, 282.75}
+ {128.49996948242188, 284.75}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1283,8 +1392,6 @@
Resize
ID
64
- Shape
- Rectangle
Style
fill
@@ -1292,12 +1399,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{72.999977111816406, 254.25}, {111, 28}}
+ {{72.999977111816406, 254.25}, {111, 30}}
Class
ShapedGraphic
FitText
@@ -1319,8 +1431,6 @@
Resize
ID
65
- Shape
- Rectangle
Style
fill
@@ -1328,14 +1438,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1396,10 +1516,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -1409,8 +1532,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Resize
ID
57
- Shape
- Rectangle
Style
fill
@@ -1444,12 +1565,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{223.99997711181641, 334}, {111, 28}}
+ {{223.99997711181641, 334}, {111, 30}}
Class
ShapedGraphic
FitText
@@ -1471,8 +1597,6 @@
Resize
ID
59
- Shape
- Rectangle
Style
fill
@@ -1480,14 +1604,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Points
{375.49995613098145, 349}
- {335.49995001008284, 348.58333317851128}
+ {335.49997711181641, 349}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1556,6 +1690,11 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1583,10 +1722,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -1596,8 +1738,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1657,8 +1804,6 @@
Resize
ID
50
- Shape
- Rectangle
Style
fill
@@ -1666,12 +1811,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Bounds
- {{375.49997329711914, 256}, {111, 28}}
+ {{375.49997329711914, 256}, {111, 30}}
Class
ShapedGraphic
FitText
@@ -1693,8 +1843,6 @@
Resize
ID
51
- Shape
- Rectangle
Style
fill
@@ -1702,14 +1850,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Resize
ID
6
- Shape
- Rectangle
Style
fill
@@ -1765,8 +1916,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Resize
ID
5
- Shape
- Rectangle
Style
fill
@@ -1809,8 +1958,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1896,7 +2050,13 @@
Shape
Circle
Style
-
+
+ shadow
+
+ Draws
+ NO
+
+
ID
@@ -1916,10 +2076,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -1929,8 +2092,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
36
Points
- {335.49991289730917, 177.12953473804851}
+ {335.49991290377352, 177.12953473794801}
{375.99998664855957, 176.5}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -1985,8 +2153,6 @@
Resize
ID
34
- Shape
- Rectangle
Style
fill
@@ -1994,12 +2160,17 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Resize
ID
35
- Shape
- Rectangle
Style
fill
@@ -2030,14 +2199,19 @@
GradientCenter
{-0.29411799999999999, -0.264706}
+ shadow
+
+ Draws
+ NO
+
Text
Align
0
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
Points
{183.49998664855957, 177}
- {223.50000039884759, 177.41666686784782}
+ {223.50000042165541, 177.4166668680854}
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -2115,6 +2294,11 @@
Style
+ shadow
+
+ Draws
+ NO
+
stroke
HeadArrow
@@ -2142,10 +2326,13 @@
{1, 0}
{-1, 0}
- Shape
- Rectangle
Style
+ shadow
+
+ Draws
+ NO
+
stroke
CornerRadius
@@ -2155,8 +2342,8 @@
Text
Text
- {\rtf1\ansi\ansicpg1252\cocoartf1347\cocoasubrtf570
-\cocoascreenfonts1{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+ {\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 @@
GuidesVisible
YES
HPages
- 1
+ 2
ImageCounter
1
KeepToScale
@@ -2231,6 +2418,8 @@
0.0
layoutEngine
dot
+ neatoLineLength
+ 0.20000000298023224
neatoSeparation
0.0
twopiSeparation
@@ -2243,9 +2432,9 @@
MasterSheets
ModificationDate
- 2015-05-04 08:36:28 +0000
+ 2015-05-24 17:35:18 +0000
Modifier
- Tatsuki IHA
+ one
NotesVisible
NO
Orientation
@@ -2274,12 +2463,12 @@
NSPaperSize
size
- {594.99997329711914, 842}
+ {595, 842}
NSPrintReverseOrientation
- int
- 0
+ coded
+ BAtzdHJlYW10eXBlZIHoA4QBQISEhAhOU051bWJlcgCEhAdOU1ZhbHVlAISECE5TT2JqZWN0AIWEASqEhAFxlwCG
NSRightMargin
@@ -2311,34 +2500,27 @@
UseEntirePage
VPages
- 2
+ 1
WindowInfo
CurrentSheet
0
- ExpandedCanvases
-
-
- name
- sender receiver
-
-
+ Expanded_Canvases
+
Frame
- {{615, 0}, {1029, 925}}
- ListView
+ {{597, 594}, {1325, 925}}
+ ShowInfo
- OutlineWidth
- 142
- RightSidebar
-
ShowRuler
Sidebar
SidebarWidth
- 120
+ 200
+ TopSlabHeight
+ 250
VisibleRegion
- {{-168, 9.5}, {894, 783}}
+ {{248, 15}, {811, 768}}
Zoom
1
ZoomValues
diff -r 399ed10d1760 -r 0299b90256e5 src/llrb/llrb.c
--- 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);
diff -r 399ed10d1760 -r 0299b90256e5 src/llrb/llrbContext.h
--- 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;
};