OSDN Git Service

.
authorKAZUu <kazuu48@hotmail.com>
Tue, 17 Nov 2009 10:56:04 +0000 (19:56 +0900)
committerKAZUu <kazuu48@hotmail.com>
Tue, 17 Nov 2009 10:56:04 +0000 (19:56 +0900)
150 files changed:
.gitignore [deleted file]
ConditionSelectorGenerator/Main.Designer.cs
ConditionSelectorGenerator/Main.cs
CoverageFramework.sln
CoverageFramework/CoverageFramework.csproj
CoverageFramework/Element/Decorator/C/BlockDecoratorForC.cs [moved from CoverageFramework/Operator/Decorator/C/BlockDecoratorForC.cs with 85% similarity]
CoverageFramework/Element/Decorator/C/BranchCoverageDecoratorForC.cs [moved from CoverageFramework/Operator/Decorator/C/BranchCoverageDecoratorForC.cs with 89% similarity]
CoverageFramework/Element/Decorator/ITaggedXElementDecorator.cs [moved from CoverageFramework/Operator/Decorator/ITaggedXElementDecorator.cs with 75% similarity]
CoverageFramework/Element/Decorator/ITaggedXElementDecoratorFactory.cs [new file with mode: 0644]
CoverageFramework/Element/Decorator/IXElementDecorator.cs [moved from CoverageFramework/Operator/Decorator/IXElementDecorator.cs with 73% similarity]
CoverageFramework/Element/Decorator/IXElementDecoratorFactory.cs [new file with mode: 0644]
CoverageFramework/Element/Decorator/Java/BlockDecoratorForJava.cs [moved from CoverageFramework/Operator/Decorator/Java/BlockDecoratorForJava.cs with 83% similarity]
CoverageFramework/Element/Decorator/Java/BranchCoverageDecoratorForJava.cs [moved from CoverageFramework/Operator/Decorator/Java/BranchCoverageDecoratorForJava.cs with 90% similarity]
CoverageFramework/Element/Decorator/Python/BranchCoverageDecoratorForPython.cs [moved from CoverageFramework/Operator/Decorator/Python/BranchCoverageDecoratorForPython.cs with 89% similarity]
CoverageFramework/Element/Decorator/TaggedXElementDecoratorFactory.cs [new file with mode: 0644]
CoverageFramework/Element/Decorator/XElementDecoratorFactory.cs [new file with mode: 0644]
CoverageFramework/Element/Generator/C/ImportGeneratorForC.cs [moved from CoverageFramework/Operator/Generator/C/ImportGeneratorForC.cs with 79% similarity]
CoverageFramework/Element/Generator/C/StatementCoverageGeneratorForC.cs [moved from CoverageFramework/Operator/Generator/C/StatementCoverageGeneratorForC.cs with 88% similarity]
CoverageFramework/Element/Generator/ITaggedXElementGenerator.cs [moved from CoverageFramework/Operator/Generator/ITaggedXElementGenerator.cs with 88% similarity]
CoverageFramework/Element/Generator/IXElementGenerator.cs [moved from CoverageFramework/Operator/Generator/IXElementGenerator.cs with 62% similarity]
CoverageFramework/Element/Generator/IXElementGeneratorFactory.cs [new file with mode: 0644]
CoverageFramework/Element/Generator/Java/ImportGeneratorForJava.cs [moved from CoverageFramework/Operator/Generator/Java/ImportGeneratorForJava.cs with 79% similarity]
CoverageFramework/Element/Generator/Java/StatementCoverageGeneratorForJava.cs [moved from CoverageFramework/Operator/Generator/Java/StatementCoverageGeneratorForJava.cs with 89% similarity]
CoverageFramework/Element/Generator/Python/ImportGeneratorForPython.cs [moved from CoverageFramework/Operator/Generator/Python/ImportGeneratorForPython.cs with 80% similarity]
CoverageFramework/Element/Generator/Python/StatementCoverageGeneratorForPython.cs [moved from CoverageFramework/Operator/Generator/Python/StatementCoverageGeneratorForPython.cs with 88% similarity]
CoverageFramework/Element/Generator/XElementGeneratorFactory.cs [new file with mode: 0644]
CoverageFramework/Element/Selector/AtomicBooleanTermSelector.cd [moved from CoverageFramework/Operator/Selector/AtomicBooleanTermSelector.cd with 71% similarity]
CoverageFramework/Element/Selector/AtomicBooleanTermSelector.cs [moved from CoverageFramework/Operator/Selector/AtomicBooleanTermSelector.cs with 93% similarity]
CoverageFramework/Element/Selector/AtomicStatementSelector.cs [moved from CoverageFramework/Operator/Selector/AtomicStatementSelector.cs with 90% similarity]
CoverageFramework/Element/Selector/C/AtomicBooleanTermSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/AtomicBooleanTermSelectorForC.cs with 91% similarity]
CoverageFramework/Element/Selector/C/ControlFlowSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/ControlFlowSelectorForC.cs with 90% similarity]
CoverageFramework/Element/Selector/C/ControlFlowStatementSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/ControlFlowStatementSelectorForC.cs with 88% similarity]
CoverageFramework/Element/Selector/C/DoWhileSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/DoWhileSelectorForC.cs with 74% similarity]
CoverageFramework/Element/Selector/C/DoWhileStatementSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/DoWhileStatementSelectorForC.cs with 71% similarity]
CoverageFramework/Element/Selector/C/ForSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/ForSelectorForC.cs with 73% similarity]
CoverageFramework/Element/Selector/C/IfElseStatementSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/IfElseStatementSelectorForC.cs with 89% similarity]
CoverageFramework/Element/Selector/C/IfSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/IfSelectorForC.cs with 72% similarity]
CoverageFramework/Element/Selector/C/LackingBlockStatementSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/LackingBlockStatementSelectorForC.cs with 91% similarity]
CoverageFramework/Element/Selector/C/ParenthesisSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/ParenthesisSelectorForC.cs with 82% similarity]
CoverageFramework/Element/Selector/C/SwitchCaseSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/SwitchCaseSelectorForC.cs with 91% similarity]
CoverageFramework/Element/Selector/C/SwitchSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/SwitchSelectorForC.cs with 89% similarity]
CoverageFramework/Element/Selector/C/WhileForStatementSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/WhileForStatementSelectorForC.cs with 72% similarity]
CoverageFramework/Element/Selector/C/WhileSelectorForC.cs [moved from CoverageFramework/Operator/Selector/C/WhileSelectorForC.cs with 73% similarity]
CoverageFramework/Element/Selector/C2/ConditionalTermSelector.cs [new file with mode: 0644]
CoverageFramework/Element/Selector/C2/IfConditionSelector.cs [moved from CoverageFramework/Operator/Selector/C2/IfConditionSelector.cs with 70% similarity]
CoverageFramework/Element/Selector/C2/LackingBlockSelector.cs [moved from CoverageFramework/Operator/Selector/C2/LackingBlockSelector.cs with 66% similarity]
CoverageFramework/Element/Selector/C2/StatementSelector.cs [moved from CoverageFramework/Operator/Selector/Python3/SimpleStatementSelector.cs with 61% similarity]
CoverageFramework/Element/Selector/DistinctSelector.cs [moved from CoverageFramework/Operator/Selector/DistinctSelector.cs with 89% similarity]
CoverageFramework/Element/Selector/IXElementRangeSelector.cs [moved from CoverageFramework/Operator/Selector/IXElementRangeSelector.cs with 74% similarity]
CoverageFramework/Element/Selector/IXElementSelector.cs [moved from CoverageFramework/Operator/Selector/IXElementSelector.cs with 76% similarity]
CoverageFramework/Element/Selector/Java/AtomicBooleanTermSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/AtomicBooleanTermSelectorForJava.cs with 91% similarity]
CoverageFramework/Element/Selector/Java/ControlFlowSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/ControlFlowSelectorForJava.cs with 87% similarity]
CoverageFramework/Element/Selector/Java/ControlFlowStatementSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/ControlFlowStatementSelectorForJava.cs with 87% similarity]
CoverageFramework/Element/Selector/Java/DoWhileSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/DoWhileSelectorForJava.cs with 71% similarity]
CoverageFramework/Element/Selector/Java/DoWhileStatementSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/DoWhileStatementSelectorForJava.cs with 71% similarity]
CoverageFramework/Element/Selector/Java/ForEachSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/ForEachSelectorForJava.cs with 72% similarity]
CoverageFramework/Element/Selector/Java/ForSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/ForSelectorForJava.cs with 74% similarity]
CoverageFramework/Element/Selector/Java/ForWhileStatementSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/ForWhileStatementSelectorForJava.cs with 72% similarity]
CoverageFramework/Element/Selector/Java/IfElseStatementSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/IfElseStatementSelectorForJava.cs with 88% similarity]
CoverageFramework/Element/Selector/Java/IfSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/IfSelectorForJava.cs with 76% similarity]
CoverageFramework/Element/Selector/Java/LackingBlockStatementSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/LackingBlockStatementSelectorForJava.cs with 91% similarity]
CoverageFramework/Element/Selector/Java/ParenthesisSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/ParenthesisSelectorForJava.cs with 81% similarity]
CoverageFramework/Element/Selector/Java/SwitchCaseSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/SwitchCaseSelectorForJava.cs with 88% similarity]
CoverageFramework/Element/Selector/Java/SwitchSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/SwitchSelectorForJava.cs with 87% similarity]
CoverageFramework/Element/Selector/Java/WhileSelectorForJava.cs [moved from CoverageFramework/Operator/Selector/Java/WhileSelectorForJava.cs with 74% similarity]
CoverageFramework/Element/Selector/Java2/ConditionalTermSelector.cs [moved from CoverageFramework/Operator/Selector/C2/ConditionalTermSelector.cs with 92% similarity]
CoverageFramework/Element/Selector/Java2/IfConditionSelector.cs [moved from CoverageFramework/Operator/Selector/Java2/IfConditionSelector.cs with 89% similarity]
CoverageFramework/Element/Selector/Java2/LackingBlockSelector.cs [moved from CoverageFramework/Operator/Selector/Java2/LackingBlockSelector.cs with 71% similarity]
CoverageFramework/Element/Selector/Java2/StatementSelector.cs [moved from CoverageFramework/Operator/Selector/Java2/StatementSelector.cs with 91% similarity]
CoverageFramework/Element/Selector/ParenthesisSelector.cs [moved from CoverageFramework/Operator/Selector/ParenthesisSelector.cs with 89% similarity]
CoverageFramework/Element/Selector/Python/AtomicBooleanTermSelectorForPython.cs [moved from CoverageFramework/Operator/Selector/Python/AtomicBooleanTermSelectorForPython.cs with 90% similarity]
CoverageFramework/Element/Selector/Python/AtomicStatementSelectorForPython.cs [moved from CoverageFramework/Operator/Selector/Python/AtomicStatementSelectorForPython.cs with 83% similarity]
CoverageFramework/Element/Selector/Python/ConditionalOperatorSelectorForPython.cs [moved from CoverageFramework/Operator/Selector/Python/ConditionalOperatorSelectorForPython.cs with 90% similarity]
CoverageFramework/Element/Selector/Python/IfConditionExpressionSelectorForPython.cs [moved from CoverageFramework/Operator/Selector/Python/IfConditionExpressionSelectorForPython.cs with 91% similarity]
CoverageFramework/Element/Selector/Python3/ConditionalTermSelector.cs [moved from CoverageFramework/Operator/Selector/AtomicConditionalTermSelector.cs with 54% similarity]
CoverageFramework/Element/Selector/Python3/ForIfConditionSelector.cs [moved from CoverageFramework/Operator/Selector/Python3/ForIfConditionSelector.cs with 85% similarity]
CoverageFramework/Element/Selector/Python3/IfConditionSelector.cs [moved from CoverageFramework/Operator/Selector/Python3/IfConditionSelector.cs with 65% similarity]
CoverageFramework/Element/Selector/Python3/StatementSelector.cs [new file with mode: 0644]
CoverageFramework/Element/Selector/Python3/TernaryOperatorSelector.cs [moved from CoverageFramework/Operator/Selector/Python3/TernaryOperatorSelector.cs with 86% similarity]
CoverageFramework/Element/Selector/Selector.cd [moved from CoverageFramework/Operator/Selector/Selector.cd with 72% similarity]
CoverageFramework/Element/Selector/XElementRangeSelectorAnyInRangePipe.cs [moved from CoverageFramework/Operator/Selector/XElementRangeSelectorAnyInRangePipe.cs with 92% similarity]
CoverageFramework/Element/Selector/XElementRangeSelectorPipe.cs [moved from CoverageFramework/Operator/Selector/XElementRangeSelectorPipe.cs with 89% similarity]
CoverageFramework/Element/Selector/XElementRangeSelectorUnion.cs [moved from CoverageFramework/Operator/Selector/XElementRangeSelectorUnion.cs with 88% similarity]
CoverageFramework/Element/Selector/XElementSelector.cs [moved from CoverageFramework/Operator/Selector/XElementSelector.cs with 84% similarity]
CoverageFramework/Element/Selector/XElementSelectorPipe.cs [moved from CoverageFramework/Operator/Selector/XElementSelectorPipe.cs with 87% similarity]
CoverageFramework/Element/Selector/XElementSelectorUnion.cs [moved from CoverageFramework/Operator/Selector/XElementSelectorUnion.cs with 88% similarity]
CoverageFramework/Embedder/BlockEmbedder.cs
CoverageFramework/Embedder/BranchCoverageEmbedder.cs [moved from CoverageFramework/Embedder/DecisionCoverageEmbedder.cs with 92% similarity]
CoverageFramework/Embedder/ConditionCoverageEmbedder.cs
CoverageFramework/Embedder/ImportEmbedderForJava.cs
CoverageFramework/Embedder/ImportEmbeder.cs
CoverageFramework/Embedder/StatementCoverageEmbedder.cs
CoverageFramework/Embedder/SwitchCoverageEmbedder.cs
CoverageFramework/Extensions.cs [new file with mode: 0644]
CoverageFramework/Operator/Generator/IStatementGenerator.cs [deleted file]
CoverageFramework/Operator/Generator/Java2/IXElementGenerator.cs [deleted file]
CoverageFramework/Operator/Generator/Java2/StatementCoverageGenerator.cs [deleted file]
CoverageFramework/Operator/Generator/Python3/CompoundStatementCoverageGenerator.cs [deleted file]
CoverageFramework/Operator/Generator/Python3/ImportGenerator.cs [deleted file]
CoverageFramework/Operator/Generator/Python3/StatementCoverageGenerator.cs [deleted file]
CoverageFramework/Operator/Selector/C2/SimpleStatementSelector.cs [deleted file]
CoverageFramework/Operator/Selector/C2/StatementSelector.cs [deleted file]
CoverageFramework/Operator/Selector/Java2/ConditionalTermSelector.cs [deleted file]
CoverageFramework/Operator/Selector/Java2/SimpleStatementSelector.cs [deleted file]
CoverageFramework/Operator/Selector/Python3/CompoundStatementSelector.cs [deleted file]
CoverageFramework/Operator/Selector/Python3/ConditionalTermSelector.cs [deleted file]
CoverageFramework/Utility/InstanceFactory.cs
CoverageFramework/Utility/XElementSelectorUtil.cs
CoverageReporter/CoverageReporter.csproj
CoverageReporter/MainForm.Designer.cs
CoverageReporter/MainForm.cs
CoverageTool/CoverageTool.csproj
CoverageTool/MainForm.cs
GrammarAnalyzer/GrammarAnalyzer.csproj
MeasurementCode/CoverageManagerForJava/.classpath [deleted file]
MeasurementCode/CoverageManagerForJava/.project [deleted file]
MeasurementCode/CoverageManagerForJava/.settings/org.eclipse.jdt.core.prefs [deleted file]
MeasurementCode/CoverageManagerForJava/.settings/org.maven.ide.eclipse.prefs [deleted file]
MeasurementCode/CoverageManagerForJava/pom.xml [deleted file]
MeasurementCode/CoverageManagerForJava/src/main/java/covman/CovMan.java [deleted file]
SharedMemory/AssemblyInfo.cpp [deleted file]
SharedMemory/CoverageManager.cpp [deleted file]
SharedMemory/CoverageManager.h [deleted file]
SharedMemory/Java/CoverageManager.cpp [deleted file]
SharedMemory/Java/CoverageManager.h [deleted file]
SharedMemory/Java/CoverageManager.i [deleted file]
SharedMemory/Java/Main.class [deleted file]
SharedMemory/Java/Main.java [deleted file]
SharedMemory/Java/Stdafx.h [deleted file]
SharedMemory/Java/memo.txt [deleted file]
SharedMemory/Python/CoverageManager.cpp [deleted file]
SharedMemory/Python/CoverageManager.h [deleted file]
SharedMemory/Python/CoverageManager.i [deleted file]
SharedMemory/Python/Stdafx.h [deleted file]
SharedMemory/Python/memo.txt [deleted file]
SharedMemory/Python/setup.py [deleted file]
SharedMemory/ReadMe.txt [deleted file]
SharedMemory/SharedMemory.cpp [deleted file]
SharedMemory/SharedMemory.h [deleted file]
SharedMemory/SharedMemory.vcproj [deleted file]
SharedMemory/Stdafx.cpp [deleted file]
SharedMemory/Stdafx.h [deleted file]
SharedMemory/app.ico [deleted file]
SharedMemory/app.rc [deleted file]
SharedMemory/resource.h [deleted file]
Test/Program.cs [deleted file]
Test/Properties/AssemblyInfo.cs [deleted file]
Test/Test.csproj [deleted file]
lib/Microsoft.Contracts.dll
lib/Paraiba.dll

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 3596653..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-\r
-#ignore thumbnails created by windows\r
-Thumbs.db\r
-#Ignore files build by Visual Studio\r
-*.obj\r
-*.exe\r
-*.pdb\r
-*.user\r
-*.aps\r
-*.pch\r
-*.vspscc\r
-*_i.c\r
-*_p.c\r
-*.ncb\r
-*.suo\r
-*.tlb\r
-*.tlh\r
-*.bak\r
-*.cache\r
-*.ilk\r
-*.log\r
-[Bb]in\r
-[Dd]ebug*/\r
-*.lib\r
-*.sbr\r
-obj/\r
-[Rr]elease*/\r
-_ReSharper*/\r
-[Tt]est[Rr]esult*\r
-*.class
\ No newline at end of file
index 9fd493a..db9cacf 100644 (file)
@@ -35,7 +35,6 @@
                        this.rtbAst = new System.Windows.Forms.RichTextBox();\r
                        this.cbxAstGenerator = new System.Windows.Forms.ComboBox();\r
                        this.tabPage3 = new System.Windows.Forms.TabPage();\r
-                       this.clbSelectors2 = new System.Windows.Forms.CheckedListBox();\r
                        this.lbSelectedElements = new System.Windows.Forms.ListBox();\r
                        this.clbSelectors1 = new System.Windows.Forms.CheckedListBox();\r
                        this.rtbSelector = new System.Windows.Forms.RichTextBox();\r
                        this.tabPage10 = new System.Windows.Forms.TabPage();\r
                        this.tabPage11 = new System.Windows.Forms.TabPage();\r
                        this.btProcess = new System.Windows.Forms.Button();\r
-                       this.lbSelectedStatements = new System.Windows.Forms.ListBox();\r
-                       this.rtbStatement = new System.Windows.Forms.RichTextBox();\r
-                       this.cbxStatementGenerator = new System.Windows.Forms.ComboBox();\r
+                       this.clbSelectors2 = new System.Windows.Forms.CheckedListBox();\r
                        this.tabControl1.SuspendLayout();\r
                        this.tabPage1.SuspendLayout();\r
                        this.tabPage2.SuspendLayout();\r
                        this.tabPage3.SuspendLayout();\r
                        this.tabPage4.SuspendLayout();\r
-                       this.tabPage6.SuspendLayout();\r
                        this.SuspendLayout();\r
                        // \r
                        // tabControl1\r
                        this.tabPage3.Text = "Selector";\r
                        this.tabPage3.UseVisualStyleBackColor = true;\r
                        // \r
-                       // clbSelectors2\r
-                       // \r
-                       this.clbSelectors2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
-                                               | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this.clbSelectors2.FormattingEnabled = true;\r
-                       this.clbSelectors2.Location = new System.Drawing.Point(598, 198);\r
-                       this.clbSelectors2.Name = "clbSelectors2";\r
-                       this.clbSelectors2.Size = new System.Drawing.Size(361, 172);\r
-                       this.clbSelectors2.TabIndex = 11;\r
-                       // \r
                        // lbSelectedElements\r
                        // \r
                        this.lbSelectedElements.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));\r
                        // \r
                        // tabPage6\r
                        // \r
-                       this.tabPage6.Controls.Add(this.cbxStatementGenerator);\r
-                       this.tabPage6.Controls.Add(this.lbSelectedStatements);\r
-                       this.tabPage6.Controls.Add(this.rtbStatement);\r
                        this.tabPage6.Location = new System.Drawing.Point(4, 22);\r
                        this.tabPage6.Name = "tabPage6";\r
                        this.tabPage6.Padding = new System.Windows.Forms.Padding(3);\r
                        this.btProcess.UseVisualStyleBackColor = true;\r
                        this.btProcess.Click += new System.EventHandler(this.btProcess_Click);\r
                        // \r
-                       // lbSelectedStatements\r
-                       // \r
-                       this.lbSelectedStatements.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this.lbSelectedStatements.FormattingEnabled = true;\r
-                       this.lbSelectedStatements.ItemHeight = 12;\r
-                       this.lbSelectedStatements.Location = new System.Drawing.Point(598, 380);\r
-                       this.lbSelectedStatements.Name = "lbSelectedStatements";\r
-                       this.lbSelectedStatements.Size = new System.Drawing.Size(361, 232);\r
-                       this.lbSelectedStatements.TabIndex = 14;\r
-                       // \r
-                       // rtbStatement\r
-                       // \r
-                       this.rtbStatement.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
-                                               | System.Windows.Forms.AnchorStyles.Left)\r
-                                               | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this.rtbStatement.Location = new System.Drawing.Point(6, 32);\r
-                       this.rtbStatement.Name = "rtbStatement";\r
-                       this.rtbStatement.Size = new System.Drawing.Size(586, 587);\r
-                       this.rtbStatement.TabIndex = 12;\r
-                       this.rtbStatement.Text = "";\r
-                       // \r
-                       // cbxStatementGenerator\r
+                       // clbSelectors2\r
                        // \r
-                       this.cbxStatementGenerator.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\r
+                       this.clbSelectors2.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this.cbxStatementGenerator.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;\r
-                       this.cbxStatementGenerator.FormattingEnabled = true;\r
-                       this.cbxStatementGenerator.Location = new System.Drawing.Point(6, 6);\r
-                       this.cbxStatementGenerator.Name = "cbxStatementGenerator";\r
-                       this.cbxStatementGenerator.Size = new System.Drawing.Size(953, 20);\r
-                       this.cbxStatementGenerator.TabIndex = 16;\r
+                       this.clbSelectors2.FormattingEnabled = true;\r
+                       this.clbSelectors2.Location = new System.Drawing.Point(598, 198);\r
+                       this.clbSelectors2.Name = "clbSelectors2";\r
+                       this.clbSelectors2.Size = new System.Drawing.Size(361, 172);\r
+                       this.clbSelectors2.TabIndex = 11;\r
                        // \r
                        // Main\r
                        // \r
                        this.tabPage3.ResumeLayout(false);\r
                        this.tabPage4.ResumeLayout(false);\r
                        this.tabPage4.PerformLayout();\r
-                       this.tabPage6.ResumeLayout(false);\r
                        this.ResumeLayout(false);\r
 \r
                }\r
                private System.Windows.Forms.ListBox lbSelectedElements;\r
                private System.Windows.Forms.TextBox tbOriginal;\r
                private System.Windows.Forms.CheckedListBox clbSelectors2;\r
-               private System.Windows.Forms.ListBox lbSelectedStatements;\r
-               private System.Windows.Forms.RichTextBox rtbStatement;\r
-               private System.Windows.Forms.ComboBox cbxStatementGenerator;\r
        }\r
 }\r
 \r
index 205ac22..0875c05 100644 (file)
@@ -9,11 +9,10 @@ using System.Text;
 using System.Windows.Forms;\r
 using System.Xml.Linq;\r
 using CoverageFramework.AstGenerator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Selector;\r
 using CoverageFramework.Model;\r
 using CoverageFramework.Utility;\r
 using Paraiba.Utility;\r
-using Paraiba.Windows.Forms;\r
 using Paraiba.Xml.Linq;\r
 \r
 namespace ConditionSelectorGenerator\r
@@ -38,11 +37,6 @@ namespace ConditionSelectorGenerator
                                clbSelectors1.Items.Add(selector.GetType().ToString());\r
                                clbSelectors2.Items.Add(selector.GetType().ToString());\r
                        }\r
-\r
-                       foreach (var generator in InstanceFactory.XElementGenerators)\r
-                       {\r
-                               cbxStatementGenerator.Items.Add(generator.GetType().ToString());\r
-                       }\r
                }\r
 \r
                private void SelectText(RichTextBox richTextBox, CodePosition pos)\r
@@ -157,8 +151,11 @@ namespace ConditionSelectorGenerator
                        SetConditionSelectorTabContent(ast);\r
                }\r
 \r
-               private IXElementSelector GetSelector()\r
+               private void SetSelectorTabContent(XDocument ast)\r
                {\r
+                       lbSelectedElements.Items.Clear();\r
+                       rtbSelector.Text = tbOriginal.Text;\r
+\r
                        IXElementSelector selector = null;\r
 \r
                        if (clbSelectors1.CheckedIndices.Count > 0)\r
@@ -177,15 +174,6 @@ namespace ConditionSelectorGenerator
                                        XElementSelectorUtil.Merge(selectors2);\r
                        }\r
 \r
-                       return selector;\r
-               }\r
-\r
-               private void SetSelectorTabContent(XDocument ast)\r
-               {\r
-                       lbSelectedElements.Items.Clear();\r
-                       rtbSelector.Text = tbOriginal.Text;\r
-\r
-                       var selector = GetSelector();\r
                        if (selector == null)\r
                                return;\r
 \r
@@ -248,17 +236,16 @@ namespace ConditionSelectorGenerator
                                richTextBox1.SelectionColor = Color.Red;\r
                        }\r
                }\r
+       }\r
 \r
-               private void SetStatemetTabContent(XDocument ast)\r
+       static class Extensions\r
+       {\r
+               public static IEnumerable<int> AsEnumerableInt(this CheckedListBox.CheckedIndexCollection collection)\r
                {\r
-                       if (cbxStatementGenerator.SelectedIndex < 0)\r
-                               return;\r
-\r
-                       var selector = GetSelector();\r
-                       if (selector == null)\r
-                               return;\r
-                       \r
-\r
+                       for (int i = 0; i < collection.Count; i++)\r
+                       {\r
+                               yield return collection[i];\r
+                       }\r
                }\r
        }\r
 }\r
index 607c395..3c81bdf 100644 (file)
@@ -11,91 +11,32 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConditionSelectorGenerator"
 EndProject\r
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CoverageTool", "CoverageTool\CoverageTool.csproj", "{81DDD59B-6631-4EDE-9363-64B87F8EB19A}"\r
 EndProject\r
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SharedMemory", "SharedMemory\SharedMemory.vcproj", "{3958C313-7307-47C4-A091-E1C7579A813A}"\r
-EndProject\r
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test", "Test\Test.csproj", "{4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}"\r
-EndProject\r
 Global\r
        GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
                Debug|Any CPU = Debug|Any CPU\r
-               Debug|Mixed Platforms = Debug|Mixed Platforms\r
-               Debug|Win32 = Debug|Win32\r
                Release|Any CPU = Release|Any CPU\r
-               Release|Mixed Platforms = Release|Mixed Platforms\r
-               Release|Win32 = Release|Win32\r
        EndGlobalSection\r
        GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
                {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
                {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {3616296C-1F01-4CE5-ADC1-491074B6BC71}.Release|Win32.ActiveCfg = Release|Any CPU\r
                {840CD835-7119-4043-9600-4F94FA66E4E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {840CD835-7119-4043-9600-4F94FA66E4E2}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {840CD835-7119-4043-9600-4F94FA66E4E2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {840CD835-7119-4043-9600-4F94FA66E4E2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {840CD835-7119-4043-9600-4F94FA66E4E2}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
                {840CD835-7119-4043-9600-4F94FA66E4E2}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {840CD835-7119-4043-9600-4F94FA66E4E2}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {840CD835-7119-4043-9600-4F94FA66E4E2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {840CD835-7119-4043-9600-4F94FA66E4E2}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {840CD835-7119-4043-9600-4F94FA66E4E2}.Release|Win32.ActiveCfg = Release|Any CPU\r
                {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
                {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {9E57B853-E651-4319-9C73-0D7D17BEC8D2}.Release|Win32.ActiveCfg = Release|Any CPU\r
                {960220CF-4E02-4C38-88D8-7B07412808FD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {960220CF-4E02-4C38-88D8-7B07412808FD}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {960220CF-4E02-4C38-88D8-7B07412808FD}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {960220CF-4E02-4C38-88D8-7B07412808FD}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {960220CF-4E02-4C38-88D8-7B07412808FD}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
                {960220CF-4E02-4C38-88D8-7B07412808FD}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {960220CF-4E02-4C38-88D8-7B07412808FD}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {960220CF-4E02-4C38-88D8-7B07412808FD}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {960220CF-4E02-4C38-88D8-7B07412808FD}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {960220CF-4E02-4C38-88D8-7B07412808FD}.Release|Win32.ActiveCfg = Release|Any CPU\r
                {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
                {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
                {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
                {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {81DDD59B-6631-4EDE-9363-64B87F8EB19A}.Release|Win32.ActiveCfg = Release|Any CPU\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Debug|Any CPU.ActiveCfg = Debug|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Debug|Any CPU.Build.0 = Debug|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Debug|Mixed Platforms.Build.0 = Debug|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Debug|Win32.ActiveCfg = Debug|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Debug|Win32.Build.0 = Debug|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Release|Any CPU.ActiveCfg = Release|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Release|Mixed Platforms.ActiveCfg = Release|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Release|Mixed Platforms.Build.0 = Release|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Release|Win32.ActiveCfg = Release|Win32\r
-               {3958C313-7307-47C4-A091-E1C7579A813A}.Release|Win32.Build.0 = Release|Win32\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Debug|Any CPU.Build.0 = Debug|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Debug|Win32.ActiveCfg = Debug|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Release|Any CPU.ActiveCfg = Release|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Release|Any CPU.Build.0 = Release|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Release|Mixed Platforms.Build.0 = Release|Any CPU\r
-               {4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}.Release|Win32.ActiveCfg = Release|Any CPU\r
        EndGlobalSection\r
        GlobalSection(SolutionProperties) = preSolution\r
                HideSolutionNode = FALSE\r
index 0a68d78..07c85a5 100644 (file)
   <ItemGroup>\r
     <Compile Include="AstGenerator\AstGenerator.cs" />\r
     <Compile Include="AstGenerator\Python3\AstGenerator.cs" />\r
-    <Compile Include="Operator\Generator\IStatementGenerator.cs" />\r
-    <Compile Include="Operator\Generator\Java2\IXElementGenerator.cs" />\r
-    <Compile Include="Operator\Generator\Java2\StatementCoverageGenerator.cs" />\r
-    <Compile Include="Operator\Generator\Python3\CompoundStatementCoverageGenerator.cs" />\r
-    <Compile Include="Operator\Generator\Python3\ImportGenerator.cs" />\r
-    <Compile Include="Operator\Generator\Python3\StatementCoverageGenerator.cs" />\r
-    <Compile Include="Operator\Selector\AtomicConditionalTermSelector.cs" />\r
-    <Compile Include="Operator\Selector\C2\ConditionalTermSelector.cs" />\r
-    <Compile Include="Operator\Selector\C2\IfConditionSelector.cs" />\r
-    <Compile Include="Operator\Selector\C2\LackingBlockSelector.cs" />\r
-    <Compile Include="Operator\Selector\C2\SimpleStatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\C2\StatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\Java2\ConditionalTermSelector.cs" />\r
-    <Compile Include="Operator\Selector\Java2\IfConditionSelector.cs" />\r
-    <Compile Include="Operator\Selector\Java2\LackingBlockSelector.cs" />\r
-    <Compile Include="Operator\Selector\Java2\SimpleStatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\Java2\StatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\Python3\CompoundStatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\XElementSelectorPipe.cs" />\r
-    <Compile Include="Operator\Selector\XElementSelectorUnion.cs" />\r
+    <Compile Include="Element\Selector\C2\ConditionalTermSelector.cs" />\r
+    <Compile Include="Element\Selector\C2\IfConditionSelector.cs" />\r
+    <Compile Include="Element\Selector\C2\LackingBlockSelector.cs" />\r
+    <Compile Include="Element\Selector\C2\StatementSelector.cs" />\r
+    <Compile Include="Element\Selector\Java2\ConditionalTermSelector.cs" />\r
+    <Compile Include="Element\Selector\Java2\IfConditionSelector.cs" />\r
+    <Compile Include="Element\Selector\Java2\LackingBlockSelector.cs" />\r
+    <Compile Include="Element\Selector\Java2\StatementSelector.cs" />\r
+    <Compile Include="Element\Selector\XElementSelectorPipe.cs" />\r
+    <Compile Include="Element\Selector\XElementSelectorUnion.cs" />\r
+    <Compile Include="Extensions.cs" />\r
     <Compile Include="Utility\InstanceFactory.cs" />\r
     <Compile Include="AstGenerator\C\AstGenerator.cs" />\r
     <Compile Include="AstGenerator\IAstGenerator.cs" />\r
     <Compile Include="CodeGenerator\Python\SourceCodeGeneratorForPython.cs" />\r
     <Compile Include="CodeGenerator\SourceCodeGenerator.cs" />\r
     <Compile Include="CodePath.cs" />\r
-    <Compile Include="Operator\Decorator\C\BlockDecoratorForC.cs" />\r
-    <Compile Include="Operator\Decorator\C\BranchCoverageDecoratorForC.cs" />\r
-    <Compile Include="Operator\Decorator\ITaggedXElementDecorator.cs" />\r
-    <Compile Include="Operator\Decorator\IXElementDecorator.cs" />\r
-    <Compile Include="Operator\Decorator\Java\BlockDecoratorForJava.cs" />\r
-    <Compile Include="Operator\Decorator\Java\BranchCoverageDecoratorForJava.cs" />\r
-    <Compile Include="Operator\Decorator\Python\BranchCoverageDecoratorForPython.cs" />\r
-    <Compile Include="Operator\Generator\C\ImportGeneratorForC.cs" />\r
-    <Compile Include="Operator\Generator\C\StatementCoverageGeneratorForC.cs" />\r
-    <Compile Include="Operator\Generator\ITaggedXElementGenerator.cs" />\r
-    <Compile Include="Operator\Generator\IXElementGenerator.cs" />\r
-    <Compile Include="Operator\Generator\Java\ImportGeneratorForJava.cs" />\r
-    <Compile Include="Operator\Generator\Java\StatementCoverageGeneratorForJava.cs" />\r
-    <Compile Include="Operator\Generator\Python\ImportGeneratorForPython.cs" />\r
-    <Compile Include="Operator\Generator\Python\StatementCoverageGeneratorForPython.cs" />\r
-    <Compile Include="Operator\Selector\AtomicBooleanTermSelector.cs" />\r
-    <Compile Include="Operator\Selector\AtomicStatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\C\AtomicBooleanTermSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\ControlFlowSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\ControlFlowStatementSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\DoWhileSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\DoWhileStatementSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\ForSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\IfElseStatementSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\IfSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\LackingBlockStatementSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\ParenthesisSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\SwitchCaseSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\SwitchSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\WhileForStatementSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\C\WhileSelectorForC.cs" />\r
-    <Compile Include="Operator\Selector\DistinctSelector.cs" />\r
-    <Compile Include="Operator\Selector\IXElementSelector.cs" />\r
-    <Compile Include="Operator\Selector\IXElementRangeSelector.cs" />\r
-    <Compile Include="Operator\Selector\Java\AtomicBooleanTermSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\ControlFlowSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\ControlFlowStatementSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\DoWhileSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\DoWhileStatementSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\ForEachSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\ForSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\ForWhileStatementSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\IfElseStatementSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\IfSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\LackingBlockStatementSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\ParenthesisSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\SwitchCaseSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\SwitchSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Java\WhileSelectorForJava.cs" />\r
-    <Compile Include="Operator\Selector\Python3\ConditionalTermSelector.cs" />\r
-    <Compile Include="Operator\Selector\Python3\ForIfConditionSelector.cs" />\r
-    <Compile Include="Operator\Selector\Python3\IfConditionSelector.cs" />\r
-    <Compile Include="Operator\Selector\ParenthesisSelector.cs" />\r
-    <Compile Include="Operator\Selector\Python3\SimpleStatementSelector.cs" />\r
-    <Compile Include="Operator\Selector\Python3\TernaryOperatorSelector.cs" />\r
-    <Compile Include="Operator\Selector\Python\AtomicBooleanTermSelectorForPython.cs" />\r
-    <Compile Include="Operator\Selector\Python\AtomicStatementSelectorForPython.cs" />\r
-    <Compile Include="Operator\Selector\Python\ConditionalOperatorSelectorForPython.cs" />\r
-    <Compile Include="Operator\Selector\Python\IfConditionExpressionSelectorForPython.cs" />\r
-    <Compile Include="Operator\Selector\XElementSelector.cs" />\r
-    <Compile Include="Operator\Selector\XElementRangeSelectorAnyInRangePipe.cs" />\r
-    <Compile Include="Operator\Selector\XElementRangeSelectorPipe.cs" />\r
-    <Compile Include="Operator\Selector\XElementRangeSelectorUnion.cs" />\r
+    <Compile Include="Element\Decorator\C\BlockDecoratorForC.cs" />\r
+    <Compile Include="Element\Decorator\C\BranchCoverageDecoratorForC.cs" />\r
+    <Compile Include="Element\Decorator\ITaggedXElementDecorator.cs" />\r
+    <Compile Include="Element\Decorator\ITaggedXElementDecoratorFactory.cs" />\r
+    <Compile Include="Element\Decorator\IXElementDecorator.cs" />\r
+    <Compile Include="Element\Decorator\IXElementDecoratorFactory.cs" />\r
+    <Compile Include="Element\Decorator\Java\BlockDecoratorForJava.cs" />\r
+    <Compile Include="Element\Decorator\Java\BranchCoverageDecoratorForJava.cs" />\r
+    <Compile Include="Element\Decorator\Python\BranchCoverageDecoratorForPython.cs" />\r
+    <Compile Include="Element\Decorator\TaggedXElementDecoratorFactory.cs" />\r
+    <Compile Include="Element\Decorator\XElementDecoratorFactory.cs" />\r
+    <Compile Include="Element\Generator\C\ImportGeneratorForC.cs" />\r
+    <Compile Include="Element\Generator\C\StatementCoverageGeneratorForC.cs" />\r
+    <Compile Include="Element\Generator\ITaggedXElementGenerator.cs" />\r
+    <Compile Include="Element\Generator\IXElementGenerator.cs" />\r
+    <Compile Include="Element\Generator\IXElementGeneratorFactory.cs" />\r
+    <Compile Include="Element\Generator\Java\ImportGeneratorForJava.cs" />\r
+    <Compile Include="Element\Generator\Java\StatementCoverageGeneratorForJava.cs" />\r
+    <Compile Include="Element\Generator\Python\ImportGeneratorForPython.cs" />\r
+    <Compile Include="Element\Generator\Python\StatementCoverageGeneratorForPython.cs" />\r
+    <Compile Include="Element\Generator\XElementGeneratorFactory.cs" />\r
+    <Compile Include="Element\Selector\AtomicBooleanTermSelector.cs" />\r
+    <Compile Include="Element\Selector\AtomicStatementSelector.cs" />\r
+    <Compile Include="Element\Selector\C\AtomicBooleanTermSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\ControlFlowSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\ControlFlowStatementSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\DoWhileSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\DoWhileStatementSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\ForSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\IfElseStatementSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\IfSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\LackingBlockStatementSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\ParenthesisSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\SwitchCaseSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\SwitchSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\WhileForStatementSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\C\WhileSelectorForC.cs" />\r
+    <Compile Include="Element\Selector\DistinctSelector.cs" />\r
+    <Compile Include="Element\Selector\IXElementSelector.cs" />\r
+    <Compile Include="Element\Selector\IXElementRangeSelector.cs" />\r
+    <Compile Include="Element\Selector\Java\AtomicBooleanTermSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\ControlFlowSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\ControlFlowStatementSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\DoWhileSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\DoWhileStatementSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\ForEachSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\ForSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\ForWhileStatementSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\IfElseStatementSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\IfSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\LackingBlockStatementSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\ParenthesisSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\SwitchCaseSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\SwitchSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Java\WhileSelectorForJava.cs" />\r
+    <Compile Include="Element\Selector\Python3\ConditionalTermSelector.cs" />\r
+    <Compile Include="Element\Selector\Python3\ForIfConditionSelector.cs" />\r
+    <Compile Include="Element\Selector\Python3\IfConditionSelector.cs" />\r
+    <Compile Include="Element\Selector\ParenthesisSelector.cs" />\r
+    <Compile Include="Element\Selector\Python3\StatementSelector.cs" />\r
+    <Compile Include="Element\Selector\Python3\TernaryOperatorSelector.cs" />\r
+    <Compile Include="Element\Selector\Python\AtomicBooleanTermSelectorForPython.cs" />\r
+    <Compile Include="Element\Selector\Python\AtomicStatementSelectorForPython.cs" />\r
+    <Compile Include="Element\Selector\Python\ConditionalOperatorSelectorForPython.cs" />\r
+    <Compile Include="Element\Selector\Python\IfConditionExpressionSelectorForPython.cs" />\r
+    <Compile Include="Element\Selector\XElementSelector.cs" />\r
+    <Compile Include="Element\Selector\XElementRangeSelectorAnyInRangePipe.cs" />\r
+    <Compile Include="Element\Selector\XElementRangeSelectorPipe.cs" />\r
+    <Compile Include="Element\Selector\XElementRangeSelectorUnion.cs" />\r
     <Compile Include="Embedder\BlockEmbedder.cs" />\r
-    <Compile Include="Embedder\DecisionCoverageEmbedder.cs" />\r
+    <Compile Include="Embedder\BranchCoverageEmbedder.cs" />\r
     <Compile Include="Embedder\ConditionCoverageEmbedder.cs" />\r
     <Compile Include="Embedder\ImportEmbedderForJava.cs" />\r
     <Compile Include="Embedder\ImportEmbeder.cs" />\r
     <Content Include="codes\covman.py">\r
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>\r
     </Content>\r
-    <None Include="Operator\Selector\AtomicBooleanTermSelector.cd" />\r
-    <None Include="Operator\Selector\Selector.cd" />\r
+    <None Include="Element\Selector\AtomicBooleanTermSelector.cd" />\r
+    <None Include="Element\Selector\Selector.cd" />\r
   </ItemGroup>\r
   <ItemGroup>\r
     <Content Include="codes\covman.c">\r
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator.C\r
+namespace CoverageFramework.Element.Decorator.C\r
 {\r
        public class BlockDecoratorForC : IXElementDecorator\r
        {\r
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator.C\r
+namespace CoverageFramework.Element.Decorator.C\r
 {\r
        public class BranchCoverageDecoratorForC : ITaggedXElementDecorator\r
        {\r
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator\r
+namespace CoverageFramework.Element.Decorator\r
 {\r
        public interface ITaggedXElementDecorator\r
        {\r
diff --git a/CoverageFramework/Element/Decorator/ITaggedXElementDecoratorFactory.cs b/CoverageFramework/Element/Decorator/ITaggedXElementDecoratorFactory.cs
new file mode 100644 (file)
index 0000000..b389e3c
--- /dev/null
@@ -0,0 +1,7 @@
+namespace CoverageFramework.Element.Decorator\r
+{\r
+       public interface ITaggedXElementDecoratorFactory\r
+       {\r
+               ITaggedXElementDecorator GetInstance();\r
+       }\r
+}
\ No newline at end of file
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator\r
+namespace CoverageFramework.Element.Decorator\r
 {\r
        public interface IXElementDecorator\r
        {\r
diff --git a/CoverageFramework/Element/Decorator/IXElementDecoratorFactory.cs b/CoverageFramework/Element/Decorator/IXElementDecoratorFactory.cs
new file mode 100644 (file)
index 0000000..adf20fd
--- /dev/null
@@ -0,0 +1,7 @@
+namespace CoverageFramework.Element.Decorator\r
+{\r
+       public interface IXElementDecoratorFactory\r
+       {\r
+               IXElementDecorator GetInstance();\r
+       }\r
+}
\ No newline at end of file
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator.Java\r
+namespace CoverageFramework.Element.Decorator.Java\r
 {\r
        public class BlockDecoratorForJava : IXElementDecorator\r
        {\r
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator.Java\r
+namespace CoverageFramework.Element.Decorator.Java\r
 {\r
        public class BranchCoverageDecoratorForJava : ITaggedXElementDecorator\r
        {\r
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Decorator.Python\r
+namespace CoverageFramework.Element.Decorator.Python\r
 {\r
        public class BranchCoverageDecoratorForPython : ITaggedXElementDecorator\r
        {\r
diff --git a/CoverageFramework/Element/Decorator/TaggedXElementDecoratorFactory.cs b/CoverageFramework/Element/Decorator/TaggedXElementDecoratorFactory.cs
new file mode 100644 (file)
index 0000000..c328689
--- /dev/null
@@ -0,0 +1,22 @@
+namespace CoverageFramework.Element.Decorator\r
+{\r
+       public abstract class TaggedXElementDecoratorFactory : ITaggedXElementDecoratorFactory\r
+       {\r
+               private ITaggedXElementDecorator _instance;\r
+\r
+               protected abstract ITaggedXElementDecorator CreateInstance();\r
+\r
+               #region ITaggedXElementDecoratorFactory \83\81\83\93\83o\r
+\r
+               public ITaggedXElementDecorator GetInstance()\r
+               {\r
+                       if (_instance == null)\r
+                       {\r
+                               _instance = CreateInstance();\r
+                       }\r
+                       return _instance;\r
+               }\r
+\r
+               #endregion\r
+       }\r
+}
\ No newline at end of file
diff --git a/CoverageFramework/Element/Decorator/XElementDecoratorFactory.cs b/CoverageFramework/Element/Decorator/XElementDecoratorFactory.cs
new file mode 100644 (file)
index 0000000..4a655aa
--- /dev/null
@@ -0,0 +1,22 @@
+namespace CoverageFramework.Element.Decorator\r
+{\r
+       public abstract class XElementDecoratorFactory : IXElementDecoratorFactory\r
+       {\r
+               private IXElementDecorator _instance;\r
+\r
+               protected abstract IXElementDecorator CreateInstance();\r
+\r
+               #region IXElementDecoratorFactory \83\81\83\93\83o\r
+\r
+               public IXElementDecorator GetInstance()\r
+               {\r
+                       if (_instance == null)\r
+                       {\r
+                               _instance = CreateInstance();\r
+                       }\r
+                       return _instance;\r
+               }\r
+\r
+               #endregion\r
+       }\r
+}
\ No newline at end of file
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator.C\r
+namespace CoverageFramework.Element.Generator.C\r
 {\r
        public class ImportGeneratorForC : IXElementGenerator\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator.C\r
+namespace CoverageFramework.Element.Generator.C\r
 {\r
        public class StatementCoverageGeneratorForC : ITaggedXElementGenerator\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator\r
+namespace CoverageFramework.Element.Generator\r
 {\r
        public interface ITaggedXElementGenerator\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator\r
+namespace CoverageFramework.Element.Generator\r
 {\r
        public interface IXElementGenerator\r
        {\r
diff --git a/CoverageFramework/Element/Generator/IXElementGeneratorFactory.cs b/CoverageFramework/Element/Generator/IXElementGeneratorFactory.cs
new file mode 100644 (file)
index 0000000..b760d1d
--- /dev/null
@@ -0,0 +1,7 @@
+namespace CoverageFramework.Element.Generator\r
+{\r
+       public interface IXElementGeneratorFactory\r
+       {\r
+               IXElementGenerator GetInstance();\r
+       }\r
+}
\ No newline at end of file
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator.Java\r
+namespace CoverageFramework.Element.Generator.Java\r
 {\r
        public class ImportGeneratorForJava : IXElementGenerator\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator.Java\r
+namespace CoverageFramework.Element.Generator.Java\r
 {\r
        public class StatementCoverageGeneratorForJava : ITaggedXElementGenerator\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator.Python\r
+namespace CoverageFramework.Element.Generator.Python\r
 {\r
        public class ImportGeneratorForPython : IXElementGenerator\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Generator.Python\r
+namespace CoverageFramework.Element.Generator.Python\r
 {\r
        public class StatementCoverageGeneratorForPython : ITaggedXElementGenerator\r
        {\r
diff --git a/CoverageFramework/Element/Generator/XElementGeneratorFactory.cs b/CoverageFramework/Element/Generator/XElementGeneratorFactory.cs
new file mode 100644 (file)
index 0000000..654cf9f
--- /dev/null
@@ -0,0 +1,22 @@
+namespace CoverageFramework.Element.Generator\r
+{\r
+       public abstract class XElementGeneratorFactory : IXElementGeneratorFactory\r
+       {\r
+               private IXElementGenerator _instance;\r
+\r
+               protected abstract IXElementGenerator CreateInstance();\r
+\r
+               #region IXElementGeneratorFactory \83\81\83\93\83o\r
+\r
+               public IXElementGenerator GetInstance()\r
+               {\r
+                       if (_instance == null)\r
+                       {\r
+                               _instance = CreateInstance();\r
+                       }\r
+                       return _instance;\r
+               }\r
+\r
+               #endregion\r
+       }\r
+}
\ No newline at end of file
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <ClassDiagram MajorVersion="1" MinorVersion="1">\r
-  <Class Name="CoverageFramework.Operator.Selector.AtomicBooleanTermSelector" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.AtomicBooleanTermSelector" Collapsed="true">\r
     <Position X="3" Y="0.75" Width="2.25" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAQAAAQAAAAQA=</HashCode>\r
@@ -8,21 +8,21 @@
     </TypeIdentifier>\r
     <Lollipop Position="0.2" />\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.Python.AtomicBooleanTermSelectorForPython" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.Python.AtomicBooleanTermSelectorForPython" Collapsed="true">\r
     <Position X="0.5" Y="2.25" Width="3.25" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAgAAAAAAIgAQAAAAAAAAAAAAAAQAAAAAEAAAA=</HashCode>\r
       <FileName>Element\Selector\Python\AtomicBooleanTermSelectorForPython.cs</FileName>\r
     </TypeIdentifier>\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.Java.AtomicBooleanTermSelectorForJava" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.Java.AtomicBooleanTermSelectorForJava" Collapsed="true">\r
     <Position X="2.5" Y="3.25" Width="3.25" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAgAAAAAAIgAQAAAAAAAAAABAAAQAAAAAAAAAA=</HashCode>\r
       <FileName>Element\Selector\Java\AtomicBooleanTermSelectorForJava.cs</FileName>\r
     </TypeIdentifier>\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.C.AtomicBooleanTermSelectorForC" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.C.AtomicBooleanTermSelectorForC" Collapsed="true">\r
     <Position X="4.5" Y="2.25" Width="2.75" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAgAAAAAAIgAQAAAAAAAAAAAAAAQAAAAAEAAAA=</HashCode>\r
@@ -4,7 +4,7 @@ using System.Xml.Linq;
 using Paraiba.Linq;\r
 using Paraiba.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public abstract class AtomicBooleanTermSelector : IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public class AtomicStatementSelector : IXElementRangeSelector\r
        {\r
@@ -1,7 +1,7 @@
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class AtomicBooleanTermSelectorForC : AtomicBooleanTermSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public abstract class ControlFlowSelectorForC : IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public abstract class ControlFlowStatementSelectorForC : IXElementRangeSelector\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class DoWhileSelectorForC : ControlFlowSelectorForC\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class DoWhileStatementSelectorForC : ControlFlowStatementSelectorForC\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class ForSelectorForC : ControlFlowSelectorForC\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class IfElseStatementSelectorForC : IXElementRangeSelector\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class IfSelectorForC : ControlFlowSelectorForC\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using CoverageFramework.Utility;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class LackingBlockStatementSelectorForC : IXElementRangeSelector\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class ParenthesisSelectorForC : ParenthesisSelector\r
        {\r
@@ -4,7 +4,7 @@ using System.Xml.Linq;
 using Paraiba.Linq;\r
 using Paraiba.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class SwitchCaseSelectorForC : IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class SwitchSelectorForC : IXElementRangeSelector\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class WhileForStatementSelectorForC : ControlFlowStatementSelectorForC\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.C\r
+namespace CoverageFramework.Element.Selector.C\r
 {\r
        public class WhileSelectorForC : ControlFlowSelectorForC\r
        {\r
diff --git a/CoverageFramework/Element/Selector/C2/ConditionalTermSelector.cs b/CoverageFramework/Element/Selector/C2/ConditionalTermSelector.cs
new file mode 100644 (file)
index 0000000..53f859a
--- /dev/null
@@ -0,0 +1,18 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.ComponentModel.Composition;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Xml.Linq;\r
+\r
+namespace CoverageFramework.Element.Selector.C2\r
+{\r
+       [Export(typeof(IXElementSelector))]\r
+       public class ConditionalTermSelector : IXElementSelector\r
+       {\r
+               public IEnumerable<XElement> Select(XElement root)\r
+               {\r
+                       throw new NotImplementedException();\r
+               }\r
+       }\r
+}\r
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C2\r
+namespace CoverageFramework.Element.Selector.C2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class IfConditionSelector : IXElementSelector\r
@@ -19,8 +19,7 @@ namespace CoverageFramework.Operator.Selector.C2
                {\r
                        return root.Descendants()\r
                                .Where(e => IfStatementNames.Contains(e.Name.LocalName))\r
-                               .Where(e => e.Elements().First().Value == "if")\r
-                               .Select(e => e.Elements().First(e2 => e2.Name.LocalName == "expression"));\r
+                               .Where(e => e.Elements().First().Value == "if");\r
                }\r
        }\r
 }\r
@@ -1,14 +1,16 @@
-using System.Collections.Generic;\r
+using System;\r
+using System.Collections.Generic;\r
 using System.ComponentModel.Composition;\r
 using System.Linq;\r
+using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C2\r
+namespace CoverageFramework.Element.Selector.C2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class LackingBlockSelector : XElementSelector\r
        {\r
-               private static readonly string[] ParentNames = {\r
+               private static readonly string[] StatementParentNames = {\r
                        "selection_statement",\r
                        "iteration_statement",\r
                };\r
@@ -20,7 +22,7 @@ namespace CoverageFramework.Operator.Selector.C2
                protected override IEnumerable<XElement> SelectContainingNull(XElement root)\r
                {\r
                        return root.Descendants()\r
-                               .Where(e => ParentNames.Contains(e.Name.LocalName))\r
+                               .Where(e => StatementParentNames.Contains(e.Name.LocalName))\r
                                .Select(e => e.Elements()\r
                                        .FirstOrDefault(e2 => StatementNames.Contains(e2.Name.LocalName)));\r
                }\r
@@ -5,16 +5,16 @@ using System.Linq;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python3\r
+namespace CoverageFramework.Element.Selector.C2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
-       public class SimpleStatementSelector : IXElementSelector\r
+       public class StatementSelector : IXElementSelector\r
        {\r
                public IEnumerable<XElement> Select(XElement root)\r
                {\r
                        return root\r
                                .Descendants()\r
-                               .Where(e => e.Name.LocalName == "small_stmt");\r
+                               .Where(e => e.Name.LocalName == "small_test");\r
                }\r
        }\r
 }\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Utility;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        // TODO: \96¢\8eg\97p\r
        public class DistinctSelector : IXElementRangeSelector\r
@@ -1,7 +1,7 @@
 using System.Collections.Generic;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public interface IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public interface IXElementSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using System.ComponentModel.Composition;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        [Export(typeof(IXElementRangeSelector))]\r
        public class AtomicBooleanTermSelectorForJava : AtomicBooleanTermSelector\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public abstract class ControlFlowSelectorForJava : IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public abstract class ControlFlowStatementSelectorForJava : IXElementRangeSelector\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class DoWhileSelectorForJava : ControlFlowSelectorForJava\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class DoWhileStatementSelectorForJava : ControlFlowStatementSelectorForJava\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class ForEachSelectorForJava : ControlFlowSelectorForJava\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class ForSelectorForJava : ControlFlowSelectorForJava\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class ForWhileStatementSelectorForJava : ControlFlowStatementSelectorForJava\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class IfElseStatementSelectorForJava : IXElementRangeSelector\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class IfSelectorForJava : ControlFlowSelectorForJava\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using CoverageFramework.Utility;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class LackingBlockStatementSelectorForJava : IXElementRangeSelector\r
        {\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class ParenthesisSelectorForJava : ParenthesisSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class SwitchCaseSelectorForJava : IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class SwitchSelectorForJava : IXElementRangeSelector\r
        {\r
@@ -1,4 +1,4 @@
-namespace CoverageFramework.Operator.Selector.Java\r
+namespace CoverageFramework.Element.Selector.Java\r
 {\r
        public class WhileSelectorForJava : ControlFlowSelectorForJava\r
        {\r
@@ -7,7 +7,7 @@ using System.Xml.Linq;
 using Paraiba.Linq;\r
 using Paraiba.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.C2\r
+namespace CoverageFramework.Element.Selector.Java2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class ConditionalTermSelector : IXElementSelector\r
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java2\r
+namespace CoverageFramework.Element.Selector.Java2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class IfConditionSelector : XElementSelector\r
@@ -1,28 +1,36 @@
-using System.Collections.Generic;\r
+using System;\r
+using System.Collections.Generic;\r
 using System.ComponentModel.Composition;\r
 using System.Linq;\r
+using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java2\r
+namespace CoverageFramework.Element.Selector.Java2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class LackingBlockSelector : IXElementSelector\r
        {\r
                private static readonly string[] StatementNames = {\r
-                       "IfThenStatement",              // If\r
+                       // If\r
+                       "IfThenStatement",\r
                        "IfThenElseStatement",\r
                        "IfThenElseStatementNoShortIf",\r
-                       "BasicForStatement",    // For\r
+                       // For\r
+                       "BasicForStatement",\r
                        "EnhancedForStatement",\r
                        "ForStatementNoShortIf",\r
-                       "WhileStatement",               // While\r
+                       // While\r
+                       "WhileStatement",\r
                        "WhileStatementNoShortIf",\r
-                       "DoStatement",                  // Do - While\r
+                       // Do - While\r
+                       "DoStatement",\r
                };\r
+\r
                private static readonly string[] BlockNames = {\r
                        "Statement",\r
                        "StatementNoShortIf",\r
                };\r
+\r
                public IEnumerable<XElement> Select(XElement root)\r
                {\r
                        return root.Descendants()\r
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Java2\r
+namespace CoverageFramework.Element.Selector.Java2\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class StatementSelector : IXElementSelector\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public abstract class ParenthesisSelector : IXElementRangeSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using System.ComponentModel.Composition;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python\r
+namespace CoverageFramework.Element.Selector.Python\r
 {\r
        [Export(typeof(IXElementRangeSelector))]\r
        public class AtomicBooleanTermSelectorForPython : AtomicBooleanTermSelector\r
@@ -1,6 +1,6 @@
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python\r
+namespace CoverageFramework.Element.Selector.Python\r
 {\r
        public class AtomicStatementSelectorForPython : AtomicStatementSelector\r
        {\r
@@ -8,7 +8,7 @@ using Paraiba.Linq;
  * \r
  */\r
 \r
-namespace CoverageFramework.Operator.Selector.Python\r
+namespace CoverageFramework.Element.Selector.Python\r
 {\r
        public class ConditionalOperatorSelectorForPython : IXElementRangeSelector\r
        {\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python\r
+namespace CoverageFramework.Element.Selector.Python\r
 {\r
        public class IfConditionExpressionSelectorForPython : IXElementRangeSelector\r
        {\r
@@ -1,23 +1,33 @@
-using System.Collections.Generic;\r
+using System;\r
+using System.Collections.Generic;\r
+using System.ComponentModel.Composition;\r
 using System.Linq;\r
+using System.Text;\r
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 using Paraiba.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector.Python3\r
 {\r
-       public abstract class AtomicConditionalTermSelector : IXElementSelector\r
+       [Export(typeof(IXElementSelector))]\r
+       public class ConditionalTermSelector : IXElementSelector\r
        {\r
-               protected abstract bool IsConditionalTerm(XElement element);\r
-               protected abstract bool IsAllowableParent(XElement element);\r
+               private static readonly string[] TargetNames = {\r
+                       "or_test",\r
+                       "and_test",\r
+               };\r
+\r
+               private static readonly string[] WithoutParentNames = {\r
+                       "trailer",\r
+               };\r
 \r
                public IEnumerable<XElement> Select(XElement root)\r
                {\r
                        var targetParents = root.Descendants()\r
-                               .Where(IsConditionalTerm)\r
+                               .Where(e => TargetNames.Contains(e.Name.LocalName))\r
                                .Where(e => e.Elements().Count() >= 3)\r
                                .Where(e => e.ParentsWhile(root)\r
-                                       .All(IsAllowableParent)\r
+                                       .All(e2 => !WithoutParentNames.Any(e2.Name.LocalName.Equals))\r
                                );\r
                        var targets = targetParents\r
                                .SelectMany(e => e.Elements().OddIndexElements());\r
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python3\r
+namespace CoverageFramework.Element.Selector.Python3\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class ForIfConditionSelector : IXElementSelector\r
@@ -1,9 +1,13 @@
-using System.Collections.Generic;\r
+using System;\r
+using System.Collections.Generic;\r
 using System.ComponentModel.Composition;\r
 using System.Linq;\r
+using System.Text;\r
 using System.Xml.Linq;\r
+using Paraiba.Linq;\r
+using Paraiba.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python3\r
+namespace CoverageFramework.Element.Selector.Python3\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class IfConditionSelector : IXElementSelector\r
diff --git a/CoverageFramework/Element/Selector/Python3/StatementSelector.cs b/CoverageFramework/Element/Selector/Python3/StatementSelector.cs
new file mode 100644 (file)
index 0000000..74581bc
--- /dev/null
@@ -0,0 +1,20 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.ComponentModel.Composition;\r
+using System.Linq;\r
+using System.Text;\r
+using System.Xml.Linq;\r
+\r
+namespace CoverageFramework.Element.Selector.Python3\r
+{\r
+       [Export(typeof(IXElementSelector))]\r
+       public class StatementSelector : IXElementSelector\r
+       {\r
+               public IEnumerable<XElement> Select(XElement root)\r
+               {\r
+                       return root\r
+                               .Descendants()\r
+                               .Where(e => e.Name.LocalName == "small_test");\r
+               }\r
+       }\r
+}\r
@@ -5,7 +5,7 @@ using System.Linq;
 using System.Text;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector.Python3\r
+namespace CoverageFramework.Element.Selector.Python3\r
 {\r
        [Export(typeof(IXElementSelector))]\r
        public class TernaryOperatorSelector : XElementSelector\r
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>\r
 <ClassDiagram MajorVersion="1" MinorVersion="1">\r
-  <Class Name="CoverageFramework.Operator.Selector.XElementSelectorPipe" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.XElementSelectorPipe" Collapsed="true">\r
     <Position X="3.75" Y="2.75" Width="2" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAAAAAAAAAAAAAAAABAAAAAAAAgAAAAQAAAAAA=</HashCode>\r
@@ -8,7 +8,7 @@
     </TypeIdentifier>\r
     <Lollipop Position="0.2" />\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.XElementSelectorUnion" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.XElementSelectorUnion" Collapsed="true">\r
     <Position X="3.75" Y="4" Width="2" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAQAAAAAA=</HashCode>\r
     </TypeIdentifier>\r
     <Lollipop Position="0.2" />\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.Java.IfSelectorForJava" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.Java.IfSelectorForJava" Collapsed="true">\r
     <Position X="0.75" Y="1.5" Width="2.5" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>\r
       <FileName>Element\Selector\Java\IfSelectorForJava.cs</FileName>\r
     </TypeIdentifier>\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.Java.ControlFlowSelectorForJava" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.Java.ControlFlowSelectorForJava" Collapsed="true">\r
     <Position X="0.75" Y="0.5" Width="2.5" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>\r
     </TypeIdentifier>\r
     <Lollipop Position="0.2" />\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.Java.ParenthesisSelectorForJava" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.Java.ParenthesisSelectorForJava" Collapsed="true">\r
     <Position X="3.75" Y="1.5" Width="2.5" />\r
     <TypeIdentifier>\r
       <HashCode>CAAAAAAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>\r
       <FileName>Element\Selector\Java\ParenthesisSelectorForJava.cs</FileName>\r
     </TypeIdentifier>\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.Java.AtomicBooleanTermSelectorForJava" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.Java.AtomicBooleanTermSelectorForJava" Collapsed="true">\r
     <Position X="0.5" Y="4" Width="3" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAgAAAAAAIgAQAAAAAAAAAABAAAQAAAAAAAAAA=</HashCode>\r
       <FileName>Element\Selector\Java\AtomicBooleanTermSelectorForJava.cs</FileName>\r
     </TypeIdentifier>\r
   </Class>\r
-  <Class Name="CoverageFramework.Operator.Selector.AtomicBooleanTermSelector" Collapsed="true">\r
+  <Class Name="CoverageFramework.Element.Selector.AtomicBooleanTermSelector" Collapsed="true">\r
     <Position X="0.75" Y="2.75" Width="2.5" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAgAAAAAAAgAAAAAAAAAAAAAAAAQAAAQAAAAQA=</HashCode>\r
@@ -53,7 +53,7 @@
     </TypeIdentifier>\r
     <Lollipop Position="0.2" />\r
   </Class>\r
-  <Interface Name="CoverageFramework.Operator.Selector.IXElementSelector" Collapsed="true">\r
+  <Interface Name="CoverageFramework.Element.Selector.IXElementSelector" Collapsed="true">\r
     <Position X="3.75" Y="0.5" Width="2" />\r
     <TypeIdentifier>\r
       <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAAAA=</HashCode>\r
@@ -3,7 +3,7 @@ using System.Linq;
 using System.Xml.Linq;\r
 using Paraiba.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        // TODO: \96¢\8eg\97p\r
        public class XElementRangeSelectorAnyInRangePipe : IXElementRangeSelector\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public class XElementRangeSelectorPipe : IXElementRangeSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public class XElementRangeSelectorUnion : IXElementRangeSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public abstract class XElementSelector : IXElementSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        public class XElementSelectorPipe : IXElementSelector\r
        {\r
@@ -2,7 +2,7 @@ using System.Collections.Generic;
 using System.Linq;\r
 using System.Xml.Linq;\r
 \r
-namespace CoverageFramework.Operator.Selector\r
+namespace CoverageFramework.Element.Selector\r
 {\r
        // \95¡\90\94\82ÌIXElementSelector\82Ì\8c\8b\89Ê\82Ì\98a\82ð\82Æ\82Á\82Ä\82Ü\82Æ\82ß\82éSelector\r
        public class XElementSelectorUnion : IXElementSelector\r
index 14b09cc..73ee05e 100644 (file)
@@ -1,7 +1,7 @@
 using System.Linq;\r
 using System.Xml.Linq;\r
-using CoverageFramework.Operator.Decorator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Decorator;\r
+using CoverageFramework.Element.Selector;\r
 \r
 namespace CoverageFramework.Embedder\r
 {\r
@@ -1,15 +1,15 @@
 using System.Collections.Generic;\r
 using System.Linq;\r
 using System.Xml.Linq;\r
-using CoverageFramework.Operator.Decorator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Decorator;\r
+using CoverageFramework.Element.Selector;\r
 using CoverageFramework.Model;\r
 using CoverageFramework.Utility;\r
 using Paraiba.Linq;\r
 \r
 namespace CoverageFramework.Embedder\r
 {\r
-       public class DecisionCoverageEmbedder\r
+       public class BranchCoverageEmbedder\r
        {\r
                private int _iBranch;\r
 \r
index 71c3125..81de405 100644 (file)
@@ -1,8 +1,8 @@
 using System.Collections.Generic;\r
 using System.Linq;\r
 using System.Xml.Linq;\r
-using CoverageFramework.Operator.Decorator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Decorator;\r
+using CoverageFramework.Element.Selector;\r
 using CoverageFramework.Model;\r
 using CoverageFramework.Utility;\r
 using Paraiba.Linq;\r
index bf758a8..0302ad6 100644 (file)
@@ -1,6 +1,6 @@
 using System.Linq;\r
 using System.Xml.Linq;\r
-using CoverageFramework.Operator.Generator;\r
+using CoverageFramework.Element.Generator;\r
 using Paraiba.Linq;\r
 \r
 namespace CoverageFramework.Embedder\r
index 6cb554b..bcf5d5e 100644 (file)
@@ -1,5 +1,5 @@
 using System.Xml.Linq;\r
-using CoverageFramework.Operator.Generator;\r
+using CoverageFramework.Element.Generator;\r
 \r
 namespace CoverageFramework.Embedder\r
 {\r
index adbbcdd..c3a8ccc 100644 (file)
@@ -1,8 +1,8 @@
 using System.Collections.Generic;\r
 using System.Linq;\r
 using System.Xml.Linq;\r
-using CoverageFramework.Operator.Generator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Generator;\r
+using CoverageFramework.Element.Selector;\r
 using CoverageFramework.Model;\r
 using CoverageFramework.Utility;\r
 using Paraiba.Linq;\r
@@ -25,29 +25,16 @@ namespace CoverageFramework.Embedder
                                });\r
                }\r
 \r
-               public IList<XElement> GetTargetElements(XElement root, IXElementSelector statementSelector, IList<CoverageInfomation> covInfos)\r
+               public void Embed(XElement root, IXElementSelector statementSelector, ITaggedXElementGenerator covGen, ITagger tagger, IDictionary<string, CoverageInfomation> covInfos)\r
                {\r
-                       var list = statementSelector.Select(root).ToList();\r
-\r
-\r
-\r
-                       return list;\r
-               }\r
-\r
-               public void Embed(IList<XElement> elements, IXElementSelector statementSelector, IStatementGenerator covGen, ITagger tagger, IList<CoverageInfomation> covInfos)\r
-               {\r
-                       //statementSelector.Select(root).ToList()\r
-                       //    .ForEach(target => {\r
-                       //        target.AddBeforeSelf(covGen.Generate());\r
-\r
-                       //        var pos = CodePositionUtil.CreateCodePosition(target);\r
-                       //        covInfos.Add(new CoverageInfomation(pos, tagger.Generate(target)));\r
-                       //    });\r
-               }\r
+                       statementSelector.Select(root).ToList()\r
+                               .ForEach(target => {\r
+                                       var key = "stmt," + (_iStatement++);\r
+                                       var pos = CodePositionUtil.CreateCodePosition(target);\r
+                                       covInfos[key] = new CoverageInfomation(pos, tagger.Generate(target));\r
 \r
-               public void Count(XElement root, IXElementSelector statementSelector)\r
-               {\r
-                       //return statementSelector.Select(root).Count();\r
+                                       target.AddBeforeSelf(covGen.Generate(key));\r
+                               });\r
                }\r
        }\r
 }
\ No newline at end of file
index e7d6f96..b38c78e 100644 (file)
@@ -2,8 +2,8 @@
 using System.Linq;\r
 using System.Xml.Linq;\r
 using Paraiba.Collections.Generic;\r
-using CoverageFramework.Operator.Generator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Generator;\r
+using CoverageFramework.Element.Selector;\r
 using CoverageFramework.Model;\r
 using CoverageFramework.Utility;\r
 using Paraiba.Linq;\r
diff --git a/CoverageFramework/Extensions.cs b/CoverageFramework/Extensions.cs
new file mode 100644 (file)
index 0000000..ca4734e
--- /dev/null
@@ -0,0 +1,41 @@
+using System;\r
+using System.Collections.Generic;\r
+using System.Linq;\r
+using System.Text;\r
+\r
+namespace CoverageFramework\r
+{\r
+       public static class Extensions\r
+       {\r
+               public static IEnumerable<T> OddIndexElements<T>(this IEnumerable<T> source)\r
+               {\r
+                       using (var etr = source.GetEnumerator())\r
+                       {\r
+                               if (etr.MoveNext())\r
+                               {\r
+                                       do\r
+                                       {\r
+                                               yield return etr.Current;\r
+                                               etr.MoveNext();\r
+                                       } while (etr.MoveNext());\r
+                               }\r
+                       }\r
+               }\r
+\r
+               public static IEnumerable<T> EvenIndexElements<T>(this IEnumerable<T> source)\r
+               {\r
+                       using (var etr = source.GetEnumerator())\r
+                       {\r
+                               etr.MoveNext();\r
+                               if (etr.MoveNext())\r
+                               {\r
+                                       do\r
+                                       {\r
+                                               yield return etr.Current;\r
+                                               etr.MoveNext();\r
+                                       } while (etr.MoveNext());\r
+                               }\r
+                       }\r
+               }\r
+       }\r
+}\r
diff --git a/CoverageFramework/Operator/Generator/IStatementGenerator.cs b/CoverageFramework/Operator/Generator/IStatementGenerator.cs
deleted file mode 100644 (file)
index 022c02a..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Generator\r
-{\r
-       public interface IStatementGenerator\r
-       {\r
-               XElement[] Generate(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Generator/Java2/IXElementGenerator.cs b/CoverageFramework/Operator/Generator/Java2/IXElementGenerator.cs
deleted file mode 100644 (file)
index f33fed6..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Generator.Java2\r
-{\r
-       public class ImportGenerator : IXElementGenerator\r
-       {\r
-               #region IXElementGenerator メンバ\r
-\r
-               public XElement[] Generate()\r
-               {\r
-                       return new[] {\r
-                               new XElement("TOKEN", "import covman.CovMan;\r\n"),\r
-                       };\r
-               }\r
-\r
-               #endregion\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Generator/Java2/StatementCoverageGenerator.cs b/CoverageFramework/Operator/Generator/Java2/StatementCoverageGenerator.cs
deleted file mode 100644 (file)
index b518082..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Generator.Java2\r
-{\r
-       [Export(typeof(IStatementGenerator))]\r
-       public class StatementCoverageGenerator : IStatementGenerator\r
-       {\r
-               public XElement[] Generate(int nameNumberHigh, int nameNumberLow, int size, int id)\r
-               {\r
-                       var str = "statement(" + nameNumberHigh + "," + nameNumberLow + "," + size + "," + id + ")";\r
-                       return new[] {\r
-                               new XElement("TOKEN", str),\r
-                               new XElement("SEMI", ";"),\r
-                       };\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Generator/Python3/CompoundStatementCoverageGenerator.cs b/CoverageFramework/Operator/Generator/Python3/CompoundStatementCoverageGenerator.cs
deleted file mode 100644 (file)
index 5724e86..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Generator.Python3\r
-{\r
-       [Export(typeof(IStatementGenerator))]\r
-       public class CompoundStatementCoverageGenerator : IStatementGenerator\r
-       {\r
-               public XElement[] Generate(int nameNumberHigh, int nameNumberLow, int size, int id)\r
-               {\r
-                       var str = "statement(" + nameNumberHigh + "," + nameNumberLow + "," + size + "," + id + ")";\r
-                       return new[] {\r
-                               new XElement("TOKEN", str),\r
-                               new XElement("NEWLINE"),\r
-                       };\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Generator/Python3/ImportGenerator.cs b/CoverageFramework/Operator/Generator/Python3/ImportGenerator.cs
deleted file mode 100644 (file)
index 086852d..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Generator.Python3\r
-{\r
-       [Export(typeof(IXElementGenerator))]\r
-       public class ImportGenerator : IXElementGenerator \r
-       {\r
-               #region IXElementGenerator メンバ\r
-\r
-               public XElement[] Generate()\r
-               {\r
-                       return new[] {\r
-                               new XElement("TOKEN", "from coverage_manager import *"),\r
-                               new XElement("NEWLINE"),\r
-                       };\r
-               }\r
-\r
-               #endregion\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Generator/Python3/StatementCoverageGenerator.cs b/CoverageFramework/Operator/Generator/Python3/StatementCoverageGenerator.cs
deleted file mode 100644 (file)
index dd3cfec..0000000
+++ /dev/null
@@ -1,22 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Generator.Python3\r
-{\r
-       [Export(typeof(IStatementGenerator))]\r
-       public class StatementCoverageGenerator : IStatementGenerator\r
-       {\r
-               public XElement[] Generate(int nameNumberHigh, int nameNumberLow, int size, int id)\r
-               {\r
-                       var str = "statement(" + nameNumberHigh + "," + nameNumberLow + "," + size + "," + id + ")";\r
-                       return new[] {\r
-                               new XElement("TOKEN", str),\r
-                               new XElement("SEMI", ";"),\r
-                       };\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Selector/C2/SimpleStatementSelector.cs b/CoverageFramework/Operator/Selector/C2/SimpleStatementSelector.cs
deleted file mode 100644 (file)
index de9f1bc..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Selector.C2\r
-{\r
-       [Export(typeof(IXElementSelector))]\r
-       public class SimpleStatementSelector : IXElementSelector\r
-       {\r
-               private static readonly string[] StatementNames = {\r
-                       "expression_statement",\r
-            "jump_statement",\r
-               };\r
-\r
-               public IEnumerable<XElement> Select(XElement root)\r
-               {\r
-                       return root.Descendants()\r
-                               .Where(e => StatementNames.Contains(e.Name.LocalName))\r
-                               .Where(e => e.Parent.Name.LocalName == "statement");\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Selector/C2/StatementSelector.cs b/CoverageFramework/Operator/Selector/C2/StatementSelector.cs
deleted file mode 100644 (file)
index 5cbc1a5..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Selector.C2\r
-{\r
-       [Export(typeof(IXElementSelector))]\r
-       public class StatementSelector : IXElementSelector\r
-       {\r
-               private static readonly string[] StatementNames = {\r
-                       "expression_statement",\r
-                       "selection_statement",\r
-                       "iteration_statement",\r
-            "jump_statement",\r
-               };\r
-\r
-               public IEnumerable<XElement> Select(XElement root)\r
-               {\r
-                       return root.Descendants()\r
-                               .Where(e => StatementNames.Contains(e.Name.LocalName))\r
-                               .Where(e => e.Parent.Name.LocalName == "statement");\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Selector/Java2/ConditionalTermSelector.cs b/CoverageFramework/Operator/Selector/Java2/ConditionalTermSelector.cs
deleted file mode 100644 (file)
index 64ffc98..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Selector.Java2\r
-{\r
-       [Export(typeof(IXElementSelector))]\r
-       public class ConditionalTermSelector : AtomicConditionalTermSelector\r
-       {\r
-               private static readonly string[] TargetNames = {\r
-                       "ConditionalAndExpression", "InclusiveOrExpression",\r
-               };\r
-               private static readonly string[] ParentNames = {\r
-                       "ArgumentList", "ArrayAccess",\r
-               };\r
-               protected override bool IsConditionalTerm(XElement element)\r
-               {\r
-                       return TargetNames.Any(element.Name.LocalName.EndsWith);\r
-               }\r
-               protected override bool IsAllowableParent(XElement element)\r
-               {\r
-                       return !ParentNames.Any(element.Name.LocalName.EndsWith);\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Selector/Java2/SimpleStatementSelector.cs b/CoverageFramework/Operator/Selector/Java2/SimpleStatementSelector.cs
deleted file mode 100644 (file)
index 9a95569..0000000
+++ /dev/null
@@ -1,37 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Selector.Java2\r
-{\r
-       [Export(typeof(IXElementSelector))]\r
-       public class SimpleStatementSelector : IXElementSelector\r
-       {\r
-               private static readonly string[] StatementNames = {\r
-                       // StatementWithoutTrailingSubstatement\r
-            //"Block",\r
-                       "EmptyStatement",\r
-                       "ExpressionStatement",\r
-                       "AssertStatement",\r
-            //"SwitchStatement",\r
-                       //"DoStatement",\r
-                       "BreakStatement",\r
-                       "ContinueStatement",\r
-                       "ReturnStatement",\r
-                       //"SynchronizedStatement",\r
-                       "ThrowStatement",\r
-                       //"TryStatement",\r
-                       // BlockStatement\r
-            "LocalVariableDeclarationStatement",\r
-               };\r
-\r
-               public IEnumerable<XElement> Select(XElement root)\r
-               {\r
-                       return root.Descendants()\r
-                               .Where(e => StatementNames.Any(e.Name.LocalName.EndsWith));\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Selector/Python3/CompoundStatementSelector.cs b/CoverageFramework/Operator/Selector/Python3/CompoundStatementSelector.cs
deleted file mode 100644 (file)
index 9104f94..0000000
+++ /dev/null
@@ -1,26 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Selector.Python3\r
-{\r
-       [Export(typeof(IXElementSelector))]\r
-       public class CompoundStatementSelector : IXElementSelector\r
-       {\r
-               private static readonly string[] StatementNames = {\r
-                       "if_stmt",\r
-                       "while_stmt",\r
-                       "for_stmt",\r
-                       "with_stmt",\r
-               };\r
-\r
-               public IEnumerable<XElement> Select(XElement root)\r
-               {\r
-                       return root.Descendants()\r
-                               .Where(e => StatementNames.Any(e.Name.LocalName.EndsWith));\r
-               }\r
-       }\r
-}\r
diff --git a/CoverageFramework/Operator/Selector/Python3/ConditionalTermSelector.cs b/CoverageFramework/Operator/Selector/Python3/ConditionalTermSelector.cs
deleted file mode 100644 (file)
index 317d21e..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.ComponentModel.Composition;\r
-using System.Linq;\r
-using System.Text;\r
-using System.Xml.Linq;\r
-using Paraiba.Linq;\r
-using Paraiba.Xml.Linq;\r
-\r
-namespace CoverageFramework.Operator.Selector.Python3\r
-{\r
-       [Export(typeof(IXElementSelector))]\r
-       public class ConditionalTermSelector : AtomicConditionalTermSelector\r
-       {\r
-               private static readonly string[] TargetNames = {\r
-                       "or_test",\r
-                       "and_test",\r
-               };\r
-\r
-               private static readonly string[] WithoutParentNames = {\r
-                       "trailer",\r
-               };\r
-\r
-               protected override bool IsConditionalTerm(XElement element)\r
-               {\r
-                       return TargetNames.Contains(element.Name.LocalName);\r
-               }\r
-\r
-               protected override bool IsAllowableParent(XElement element)\r
-               {\r
-                       return !WithoutParentNames.Contains(element.Name.LocalName);\r
-               }\r
-       }\r
-}\r
index 50e7647..9e2428b 100644 (file)
@@ -6,8 +6,7 @@ using System.Linq;
 using System.Reflection;\r
 using System.Text;\r
 using CoverageFramework.AstGenerator;\r
-using CoverageFramework.Operator.Generator;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Selector;\r
 \r
 namespace CoverageFramework.Utility\r
 {\r
@@ -26,9 +25,6 @@ namespace CoverageFramework.Utility
                [ImportMany]\r
                private IEnumerable<IXElementSelector> _xElementSelectors = null;\r
 \r
-               [ImportMany]\r
-               private IEnumerable<IXElementGenerator> _xElementGenerators = null;\r
-\r
                public static IEnumerable<IAstGenerator> AstGenerators\r
                {\r
                        get { return Instance._astGenerators; }\r
@@ -39,11 +35,6 @@ namespace CoverageFramework.Utility
                        get { return Instance._xElementSelectors; }\r
                }\r
 \r
-               public static IEnumerable<IXElementGenerator> XElementGenerators\r
-               {\r
-                       get { return Instance._xElementGenerators; }\r
-               }\r
-\r
                private InstanceFactory()\r
                {\r
                        var catalog = new AggregateCatalog();\r
index 08858fc..418fed3 100644 (file)
@@ -1,6 +1,6 @@
 using System.Collections.Generic;\r
 using System.Linq;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Selector;\r
 using Paraiba.Linq;\r
 \r
 namespace CoverageFramework.Utility\r
index e65d61d..51227d6 100644 (file)
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
     <Optimize>true</Optimize>\r
-    <OutputPath>..\Release\</OutputPath>\r
+    <OutputPath>bin\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
index ecb79da..1bc999a 100644 (file)
@@ -67,7 +67,7 @@
                        this._tbcCoverage.Location = new System.Drawing.Point(8, 32);\r
                        this._tbcCoverage.Name = "_tbcCoverage";\r
                        this._tbcCoverage.SelectedIndex = 0;\r
-                       this._tbcCoverage.Size = new System.Drawing.Size(232, 442);\r
+                       this._tbcCoverage.Size = new System.Drawing.Size(234, 474);\r
                        this._tbcCoverage.TabIndex = 0;\r
                        // \r
                        // tabPage1\r
@@ -78,7 +78,7 @@
                        this.tabPage1.Location = new System.Drawing.Point(4, 22);\r
                        this.tabPage1.Name = "tabPage1";\r
                        this.tabPage1.Padding = new System.Windows.Forms.Padding(3);\r
-                       this.tabPage1.Size = new System.Drawing.Size(224, 416);\r
+                       this.tabPage1.Size = new System.Drawing.Size(312, 318);\r
                        this.tabPage1.TabIndex = 0;\r
                        this.tabPage1.Text = "Statement";\r
                        this.tabPage1.UseVisualStyleBackColor = true;\r
@@ -92,7 +92,7 @@
                        this._txtStatement.Multiline = true;\r
                        this._txtStatement.Name = "_txtStatement";\r
                        this._txtStatement.ReadOnly = true;\r
-                       this._txtStatement.Size = new System.Drawing.Size(208, 368);\r
+                       this._txtStatement.Size = new System.Drawing.Size(210, 402);\r
                        this._txtStatement.TabIndex = 2;\r
                        // \r
                        // _lbStatement\r
                        // \r
                        this._pgbStatement.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this._pgbStatement.Location = new System.Drawing.Point(96, 8);\r
+                       this._pgbStatement.Location = new System.Drawing.Point(98, 8);\r
                        this._pgbStatement.Name = "_pgbStatement";\r
-                       this._pgbStatement.Size = new System.Drawing.Size(120, 24);\r
+                       this._pgbStatement.Size = new System.Drawing.Size(120, 23);\r
                        this._pgbStatement.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
                        this._pgbStatement.TabIndex = 0;\r
                        // \r
                        this.tabPage2.Location = new System.Drawing.Point(4, 22);\r
                        this.tabPage2.Name = "tabPage2";\r
                        this.tabPage2.Padding = new System.Windows.Forms.Padding(3);\r
-                       this.tabPage2.Size = new System.Drawing.Size(224, 416);\r
+                       this.tabPage2.Size = new System.Drawing.Size(312, 318);\r
                        this.tabPage2.TabIndex = 1;\r
                        this.tabPage2.Text = "Decision";\r
                        this.tabPage2.UseVisualStyleBackColor = true;\r
                        this._txtBranch.Multiline = true;\r
                        this._txtBranch.Name = "_txtBranch";\r
                        this._txtBranch.ReadOnly = true;\r
-                       this._txtBranch.Size = new System.Drawing.Size(208, 370);\r
+                       this._txtBranch.Size = new System.Drawing.Size(212, 307);\r
                        this._txtBranch.TabIndex = 5;\r
                        // \r
                        // _lbBranch\r
                        // \r
                        this._pgbBranch.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this._pgbBranch.Location = new System.Drawing.Point(96, 8);\r
+                       this._pgbBranch.Location = new System.Drawing.Point(97, 8);\r
                        this._pgbBranch.Name = "_pgbBranch";\r
-                       this._pgbBranch.Size = new System.Drawing.Size(120, 24);\r
+                       this._pgbBranch.Size = new System.Drawing.Size(123, 23);\r
                        this._pgbBranch.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
                        this._pgbBranch.TabIndex = 3;\r
                        // \r
                        this.tabPage3.Location = new System.Drawing.Point(4, 22);\r
                        this.tabPage3.Name = "tabPage3";\r
                        this.tabPage3.Padding = new System.Windows.Forms.Padding(3);\r
-                       this.tabPage3.Size = new System.Drawing.Size(224, 416);\r
+                       this.tabPage3.Size = new System.Drawing.Size(312, 318);\r
                        this.tabPage3.TabIndex = 2;\r
                        this.tabPage3.Text = "Condition";\r
                        this.tabPage3.UseVisualStyleBackColor = true;\r
                        this._txtCondition.Multiline = true;\r
                        this._txtCondition.Name = "_txtCondition";\r
                        this._txtCondition.ReadOnly = true;\r
-                       this._txtCondition.Size = new System.Drawing.Size(208, 368);\r
+                       this._txtCondition.Size = new System.Drawing.Size(212, 307);\r
                        this._txtCondition.TabIndex = 5;\r
                        // \r
                        // _lbCondition\r
                        // \r
                        this._pgbCondition.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this._pgbCondition.Location = new System.Drawing.Point(96, 8);\r
+                       this._pgbCondition.Location = new System.Drawing.Point(98, 8);\r
                        this._pgbCondition.Name = "_pgbCondition";\r
-                       this._pgbCondition.Size = new System.Drawing.Size(120, 24);\r
+                       this._pgbCondition.Size = new System.Drawing.Size(122, 23);\r
                        this._pgbCondition.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
                        this._pgbCondition.TabIndex = 3;\r
                        // \r
                        this.tabPage4.Location = new System.Drawing.Point(4, 22);\r
                        this.tabPage4.Name = "tabPage4";\r
                        this.tabPage4.Padding = new System.Windows.Forms.Padding(3);\r
-                       this.tabPage4.Size = new System.Drawing.Size(224, 416);\r
+                       this.tabPage4.Size = new System.Drawing.Size(312, 318);\r
                        this.tabPage4.TabIndex = 3;\r
                        this.tabPage4.Text = "Condition/Decision";\r
                        this.tabPage4.UseVisualStyleBackColor = true;\r
                        this._txtBranchCond.Multiline = true;\r
                        this._txtBranchCond.Name = "_txtBranchCond";\r
                        this._txtBranchCond.ReadOnly = true;\r
-                       this._txtBranchCond.Size = new System.Drawing.Size(208, 368);\r
+                       this._txtBranchCond.Size = new System.Drawing.Size(212, 307);\r
                        this._txtBranchCond.TabIndex = 5;\r
                        // \r
                        // _lbBranchCond\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
                        this._pgbBranchCond.Location = new System.Drawing.Point(96, 8);\r
                        this._pgbBranchCond.Name = "_pgbBranchCond";\r
-                       this._pgbBranchCond.Size = new System.Drawing.Size(120, 24);\r
+                       this._pgbBranchCond.Size = new System.Drawing.Size(124, 23);\r
                        this._pgbBranchCond.Style = System.Windows.Forms.ProgressBarStyle.Continuous;\r
                        this._pgbBranchCond.TabIndex = 3;\r
                        // \r
                        this._lbTag.Location = new System.Drawing.Point(248, 32);\r
                        this._lbTag.Name = "_lbTag";\r
                        this._lbTag.SelectionMode = System.Windows.Forms.SelectionMode.MultiExtended;\r
-                       this._lbTag.Size = new System.Drawing.Size(448, 400);\r
+                       this._lbTag.Size = new System.Drawing.Size(452, 436);\r
                        this._lbTag.TabIndex = 1;\r
                        // \r
                        // _btnAnalyze\r
                        // \r
                        this._btnAnalyze.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
-                       this._btnAnalyze.Location = new System.Drawing.Point(248, 440);\r
+                       this._btnAnalyze.Location = new System.Drawing.Point(248, 474);\r
                        this._btnAnalyze.Name = "_btnAnalyze";\r
-                       this._btnAnalyze.Size = new System.Drawing.Size(448, 32);\r
+                       this._btnAnalyze.Size = new System.Drawing.Size(452, 32);\r
                        this._btnAnalyze.TabIndex = 2;\r
                        this._btnAnalyze.Text = "Analyze";\r
                        this._btnAnalyze.UseVisualStyleBackColor = true;\r
                                                | System.Windows.Forms.AnchorStyles.Right)));\r
                        this._txtCovInfoPath.Location = new System.Drawing.Point(88, 8);\r
                        this._txtCovInfoPath.Name = "_txtCovInfoPath";\r
-                       this._txtCovInfoPath.Size = new System.Drawing.Size(604, 19);\r
+                       this._txtCovInfoPath.Size = new System.Drawing.Size(612, 19);\r
                        this._txtCovInfoPath.TabIndex = 3;\r
                        this._txtCovInfoPath.DragDrop += new System.Windows.Forms.DragEventHandler(this._txtCovInfoPath_DragDrop);\r
                        this._txtCovInfoPath.DragEnter += new System.Windows.Forms.DragEventHandler(this._txtCovInfoPath_DragEnter);\r
                        // label1\r
                        // \r
                        this.label1.AutoSize = true;\r
-                       this.label1.Location = new System.Drawing.Point(8, 8);\r
+                       this.label1.Location = new System.Drawing.Point(8, 11);\r
                        this.label1.Name = "label1";\r
                        this.label1.Size = new System.Drawing.Size(72, 12);\r
                        this.label1.TabIndex = 4;\r
                        this.AllowDrop = true;\r
                        this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);\r
                        this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;\r
-                       this.ClientSize = new System.Drawing.Size(705, 480);\r
+                       this.ClientSize = new System.Drawing.Size(709, 519);\r
                        this.Controls.Add(this.label1);\r
                        this.Controls.Add(this._txtCovInfoPath);\r
                        this.Controls.Add(this._btnAnalyze);\r
index 0a14669..04a8b17 100644 (file)
@@ -32,7 +32,7 @@ namespace CoverageReporter
 \r
                private void Form1_Load(object sender, EventArgs e)\r
                {\r
-                       _txtCovInfoPath.Text = @"C:\work\cobertura\src\main\java\coverageinfo";\r
+                       _txtCovInfoPath.Text = @"C:\Users\KAZUu\Desktop\work\maven\cobertura\src\main\java\coverageinfo";\r
                        //_txtCovInfoPath.Text = Path.GetFullPath("../../../coverageinfo");\r
                }\r
 \r
index 76bab15..3371c5b 100644 (file)
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <Optimize>false</Optimize>\r
-    <OutputPath>..\Debug\</OutputPath>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
     <Optimize>true</Optimize>\r
-    <OutputPath>..\Release\</OutputPath>\r
+    <OutputPath>bin\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
index fa34df3..13ae94e 100644 (file)
@@ -12,22 +12,22 @@ using CoverageFramework.AstGenerator.C;
 using CoverageFramework.AstGenerator.Python2;\r
 using CoverageFramework.Etc;\r
 using CoverageFramework.Embedder;\r
-using CoverageFramework.Operator.Decorator.C;\r
-using CoverageFramework.Operator.Generator.C;\r
+using CoverageFramework.Element.Decorator.C;\r
+using CoverageFramework.Element.Generator.C;\r
 using CoverageFramework.Utility;\r
-using CoverageFramework.Operator.Selector.C;\r
-using CoverageFramework.Operator.Selector;\r
+using CoverageFramework.Element.Selector.C;\r
+using CoverageFramework.Element.Selector;\r
 using CoverageFramework.CodeGenerator.C;\r
 using CoverageFramework.AstGenerator.Java;\r
-using CoverageFramework.Operator.Decorator.Java;\r
-using CoverageFramework.Operator.Selector.Java;\r
-using CoverageFramework.Operator.Generator.Java;\r
+using CoverageFramework.Element.Decorator.Java;\r
+using CoverageFramework.Element.Selector.Java;\r
+using CoverageFramework.Element.Generator.Java;\r
 using System.Runtime.Serialization.Formatters.Binary;\r
 using CoverageFramework.CodeGenerator.Java;\r
 using CoverageFramework.Model;\r
-using CoverageFramework.Operator.Decorator.Python;\r
-using CoverageFramework.Operator.Generator.Python;\r
-using CoverageFramework.Operator.Selector.Python;\r
+using CoverageFramework.Element.Decorator.Python;\r
+using CoverageFramework.Element.Generator.Python;\r
+using CoverageFramework.Element.Selector.Python;\r
 using CoverageFramework.CodeGenerator.Python;\r
 using Paraiba.Text;\r
 using AstGenerator=CoverageFramework.AstGenerator.Java.AstGenerator;\r
@@ -97,7 +97,7 @@ namespace CoverageTool
                        var switchCaseSelector = new SwitchCaseSelectorForC();\r
 \r
                        var stmtCov = new StatementCoverageEmbedder();\r
-                       var branchCov = new DecisionCoverageEmbedder();\r
+                       var branchCov = new BranchCoverageEmbedder();\r
                        var condCov = new ConditionCoverageEmbedder();\r
                        var switchCov = new SwitchCoverageEmbedder();\r
 \r
@@ -178,7 +178,7 @@ namespace CoverageTool
                        var switchCaseSelector = new SwitchCaseSelectorForJava();\r
 \r
                        var stmtCov = new StatementCoverageEmbedder();\r
-                       var branchCov = new DecisionCoverageEmbedder();\r
+                       var branchCov = new BranchCoverageEmbedder();\r
                        var condCov = new ConditionCoverageEmbedder();\r
                        var switchCov = new SwitchCoverageEmbedder();\r
 \r
@@ -245,7 +245,7 @@ namespace CoverageTool
                        var stmtSelector = new AtomicStatementSelectorForPython();\r
 \r
                        var stmtCov = new StatementCoverageEmbedder();\r
-                       var branchCov = new DecisionCoverageEmbedder();\r
+                       var branchCov = new BranchCoverageEmbedder();\r
                        var condCov = new ConditionCoverageEmbedder();\r
 \r
                        var codeGenerator = new SourceCodeGeneratorForPython();\r
@@ -360,7 +360,7 @@ namespace CoverageTool
 \r
                private void MainForm_Load(object sender, EventArgs e)\r
                {\r
-                       txtOutput.Text = @"C:\work\cobertura\src\main\java";\r
+                       txtOutput.Text = @"C:\Users\KAZUu\Desktop\work\maven\cobertura\src\main\java";\r
                        //txtOutput.Text = Directory.GetCurrentDirectory();\r
                        cmbLanguage.SelectedIndex = 0;\r
                }\r
index c7cc1fc..f1c3a3d 100644 (file)
@@ -17,7 +17,7 @@
     <DebugSymbols>true</DebugSymbols>\r
     <DebugType>full</DebugType>\r
     <Optimize>false</Optimize>\r
-    <OutputPath>..\Debug\</OutputPath>\r
+    <OutputPath>bin\Debug\</OutputPath>\r
     <DefineConstants>DEBUG;TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
@@ -25,7 +25,7 @@
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
     <DebugType>pdbonly</DebugType>\r
     <Optimize>true</Optimize>\r
-    <OutputPath>..\Release\</OutputPath>\r
+    <OutputPath>bin\Release\</OutputPath>\r
     <DefineConstants>TRACE</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
diff --git a/MeasurementCode/CoverageManagerForJava/.classpath b/MeasurementCode/CoverageManagerForJava/.classpath
deleted file mode 100644 (file)
index 1686dae..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<classpath>\r
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
-       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
-       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>\r
-       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
-       <classpathentry kind="output" path="target/classes"/>\r
-</classpath>\r
diff --git a/MeasurementCode/CoverageManagerForJava/.project b/MeasurementCode/CoverageManagerForJava/.project
deleted file mode 100644 (file)
index 9ab0a0e..0000000
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<projectDescription>\r
-       <name>CoverageManagerForJava</name>\r
-       <comment></comment>\r
-       <projects>\r
-       </projects>\r
-       <buildSpec>\r
-               <buildCommand>\r
-                       <name>org.eclipse.jdt.core.javabuilder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-               <buildCommand>\r
-                       <name>org.maven.ide.eclipse.maven2Builder</name>\r
-                       <arguments>\r
-                       </arguments>\r
-               </buildCommand>\r
-       </buildSpec>\r
-       <natures>\r
-               <nature>org.eclipse.jdt.core.javanature</nature>\r
-               <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
-       </natures>\r
-</projectDescription>\r
diff --git a/MeasurementCode/CoverageManagerForJava/.settings/org.eclipse.jdt.core.prefs b/MeasurementCode/CoverageManagerForJava/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644 (file)
index 629b5fe..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-#Fri Oct 23 17:49:56 JST 2009\r
-eclipse.preferences.version=1\r
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled\r
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6\r
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve\r
-org.eclipse.jdt.core.compiler.compliance=1.6\r
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate\r
-org.eclipse.jdt.core.compiler.debug.localVariable=generate\r
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate\r
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error\r
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error\r
-org.eclipse.jdt.core.compiler.source=1.6\r
diff --git a/MeasurementCode/CoverageManagerForJava/.settings/org.maven.ide.eclipse.prefs b/MeasurementCode/CoverageManagerForJava/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644 (file)
index c91b841..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Oct 23 17:46:10 JST 2009\r
-activeProfiles=\r
-eclipse.preferences.version=1\r
-fullBuildGoals=process-test-resources\r
-includeModules=false\r
-resolveWorkspaceProjects=true\r
-resourceFilterGoals=process-resources resources\:testResources\r
-skipCompilerPlugin=true\r
-version=1\r
diff --git a/MeasurementCode/CoverageManagerForJava/pom.xml b/MeasurementCode/CoverageManagerForJava/pom.xml
deleted file mode 100644 (file)
index b6c2c26..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>covman</groupId>
-  <artifactId>CoverageManagerForJava</artifactId>
-  <packaging>jar</packaging>
-  <version>1.0-SNAPSHOT</version>
-  <name>CoverageManagerForJava</name>
-  <url>http://maven.apache.org</url>
-  <dependencies>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-</project>
diff --git a/MeasurementCode/CoverageManagerForJava/src/main/java/covman/CovMan.java b/MeasurementCode/CoverageManagerForJava/src/main/java/covman/CovMan.java
deleted file mode 100644 (file)
index d4a5b92..0000000
+++ /dev/null
@@ -1,48 +0,0 @@
-package covman;
-
-import java.io.FileNotFoundException;
-import java.io.PrintStream;
-import java.util.HashSet;
-
-public final class CovMan {
-       private static HashSet<String> executedStatements = new HashSet<String>();
-       private static HashSet<String> trueBranches = new HashSet<String>();
-       private static HashSet<String> falseBranches = new HashSet<String>();
-       
-       static {
-               Runtime.getRuntime().addShutdownHook(new Thread() {
-                       @Override
-                       public void run() {
-                               PrintStream out;
-                               try {
-                                       out = new PrintStream("coverage_result.txt");
-                               } catch (FileNotFoundException e) {
-                                       e.printStackTrace();
-                                       out = System.out;
-                               }
-                               
-                               for (String key : executedStatements) {
-                                       out.println("3" + "," + key);
-                               }
-                               for (String key : trueBranches) {
-                                       out.println("1" + "," + key);
-                               }
-                               for (String key : falseBranches) {
-                                       out.println("2" + "," + key);
-                               }
-                       }
-               });
-       }
-       
-       public static boolean branch(String key, boolean value) {
-               if (value)
-                       trueBranches.add(key);
-               else
-                       falseBranches.add(key);
-               return value;
-       }
-       
-       public static void statement(String key) {
-               executedStatements.add(key);
-       }
-}
diff --git a/SharedMemory/AssemblyInfo.cpp b/SharedMemory/AssemblyInfo.cpp
deleted file mode 100644 (file)
index 734134e..0000000
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "stdafx.h"\r
-\r
-using namespace System;\r
-using namespace System::Reflection;\r
-using namespace System::Runtime::CompilerServices;\r
-using namespace System::Runtime::InteropServices;\r
-using namespace System::Security::Permissions;\r
-\r
-//\r
-// \83A\83Z\83\93\83u\83\8a\82É\8aÖ\82·\82é\88ê\94Ê\8fî\95ñ\82Í\88È\89º\82Ì\91®\90«\83Z\83b\83g\82ð\82Æ\82¨\82µ\82Ä\90§\8cä\82³\82ê\82Ü\82·\81B\r
-// \83A\83Z\83\93\83u\83\8a\82É\8aÖ\98A\95t\82¯\82ç\82ê\82Ä\82¢\82é\8fî\95ñ\82ð\95Ï\8dX\82·\82é\82É\82Í\81A\r
-// \82±\82ê\82ç\82Ì\91®\90«\92l\82ð\95Ï\8dX\82µ\82Ä\82­\82¾\82³\82¢\81B\r
-//\r
-[assembly:AssemblyTitleAttribute("SharedMemory")];\r
-[assembly:AssemblyDescriptionAttribute("")];\r
-[assembly:AssemblyConfigurationAttribute("")];\r
-[assembly:AssemblyCompanyAttribute("")];\r
-[assembly:AssemblyProductAttribute("SharedMemory")];\r
-[assembly:AssemblyCopyrightAttribute("Copyright (c)  2009")];\r
-[assembly:AssemblyTrademarkAttribute("")];\r
-[assembly:AssemblyCultureAttribute("")];\r
-\r
-//\r
-// \83A\83Z\83\93\83u\83\8a\82Ì\83o\81[\83W\83\87\83\93\8fî\95ñ\82Í\81A\88È\89º\82Ì 4 \82Â\82Ì\92l\82Å\8d\\90¬\82³\82ê\82Ä\82¢\82Ü\82·:\r
-//\r
-//      Major Version\r
-//      Minor Version\r
-//      Build Number\r
-//      Revision\r
-//\r
-// \82·\82×\82Ä\82Ì\92l\82ð\8ew\92è\82·\82é\82©\81A\89º\82Ì\82æ\82¤\82É '*' \82ð\8eg\82Á\82Ä\83\8a\83r\83W\83\87\83\93\82¨\82æ\82Ñ\83r\83\8b\83h\94Ô\8d\86\82ð\r
-// \8aù\92è\92l\82É\82·\82é\82±\82Æ\82ª\82Å\82«\82Ü\82·:\r
-\r
-[assembly:AssemblyVersionAttribute("1.0.*")];\r
-\r
-[assembly:ComVisible(false)];\r
-\r
-[assembly:CLSCompliantAttribute(true)];\r
-\r
-[assembly:SecurityPermission(SecurityAction::RequestMinimum, UnmanagedCode = true)];\r
diff --git a/SharedMemory/CoverageManager.cpp b/SharedMemory/CoverageManager.cpp
deleted file mode 100644 (file)
index 1414b69..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "stdafx.h"\r
-#include "CoverageManager.h"\r
-\r
-HANDLE CoverageManager::_hMemory = NULL;\r
-char *CoverageManager::_memory = NULL;\r
-\r
-int read(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-       return CoverageManager::read(nameNumberHigh, nameNumberLow, size, id);\r
-}\r
-\r
-bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value) {\r
-       return CoverageManager::branch(nameNumberHigh, nameNumberLow, size, id, value);\r
-}\r
-\r
-void statement(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-       CoverageManager::statement(nameNumberHigh, nameNumberLow, size, id);\r
-}\r
diff --git a/SharedMemory/CoverageManager.h b/SharedMemory/CoverageManager.h
deleted file mode 100644 (file)
index ecc3ff6..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef COVERAGE_MANAGER_H_\r
-#define COVERAGE_MANAGER_H_\r
-\r
-#undef UNICODE\r
-#include <stdio.h>\r
-#include <windows.h>\r
-\r
-class CoverageManager\r
-{\r
-private:\r
-       static HANDLE _hMemory;\r
-       static char *_memory;\r
-       \r
-       static bool initialize(int nameNumberHigh, int nameNumberLow, int size) {\r
-               char name[256];\r
-               sprintf(name, "%d-%d-%d", nameNumberHigh, nameNumberLow, size);\r
-\r
-               _hMemory = CreateFileMapping(\r
-                       (HANDLE)-1,                     // \83t\83@\83C\83\8b\82Ì\83n\83\93\83h\83\8b(0xFFFFFFFF\82¾\82Æ\83t\83@\83C\83\8b\82ð\90\90¬\82µ\82È\82¢)\r
-                       NULL,                           // \83Z\83L\83\85\83\8a\83e\83B\r
-                       PAGE_READWRITE,         // \95Û\8cì\r
-                       0,                                      // \83T\83C\83Y\82ð\95\\82·\8fã\88Ê DWORD\r
-                       size,                           // \83T\83C\83Y\82ð\95\\82·\89º\88Ê DWORD\r
-                       name);                          // \83I\83u\83W\83F\83N\83g\96¼\81i\8e¯\95Ê\8eq\81j\r
-               if (GetLastError() == ERROR_ALREADY_EXISTS) {\r
-                       _hMemory = OpenFileMapping(\r
-                               FILE_MAP_ALL_ACCESS,    // \83A\83N\83Z\83X\83\82\81[\83h\r
-                               FALSE,                                  // \8cp\8f³\83t\83\89\83O\81i\8eq\83v\83\8d\83Z\83X\82É\8cp\8f³\82·\82é\82©\94Û\82©\81j\r
-                               name);                                  // \83I\83u\83W\83F\83N\83g\96¼\81i\8e¯\95Ê\8eq\81j\r
-               }\r
-               if (_hMemory == NULL)\r
-                       return false;\r
-\r
-               _memory = (char*)MapViewOfFile(\r
-                       _hMemory,                               // \83t\83@\83C\83\8b\83}\83b\83s\83\93\83O\83I\83u\83W\83F\83N\83g\82Ì\83n\83\93\83h\83\8b\r
-                       FILE_MAP_ALL_ACCESS,    // \83A\83N\83Z\83X\83\82\81[\83h\r
-                       0,                                              // \83I\83t\83Z\83b\83g\82Ì\8fã\88Ê DWORD\r
-                       0,                                              // \83I\83t\83Z\83b\83g\82Ì\89º\88Ê DWORD\r
-                       0);                                             // \83}\83b\83v\91Î\8fÛ\82Ì\83o\83C\83g\90\94\r
-               if (_memory == NULL)\r
-                       return false;\r
-               return true;\r
-       }\r
-\r
-       static void write(int nameNumberHigh, int nameNumberLow, int size, int id, char value) {\r
-               if (_memory == NULL && initialize(nameNumberHigh, nameNumberLow, size) == false) {\r
-                       return;\r
-               }\r
-               _memory[id] |= value;\r
-       }\r
-\r
-public:\r
-       static int read(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-               if (_memory == NULL && initialize(nameNumberHigh, nameNumberLow, size) == false) {\r
-                       return -1;\r
-               }\r
-               return _memory[id];\r
-       }\r
-       \r
-       static bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value) {\r
-               write(nameNumberHigh, nameNumberLow, size, id, value ? 1 : 2);\r
-               return value;\r
-       }\r
-       \r
-       static void statement(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-               write(nameNumberHigh, nameNumberLow, size, id, 3);\r
-       }\r
-};\r
-\r
-extern int read(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-extern bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value);\r
-extern void statement(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-\r
-#endif //COVERAGE_MANAGER_H_\r
diff --git a/SharedMemory/Java/CoverageManager.cpp b/SharedMemory/Java/CoverageManager.cpp
deleted file mode 100644 (file)
index 1414b69..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "stdafx.h"\r
-#include "CoverageManager.h"\r
-\r
-HANDLE CoverageManager::_hMemory = NULL;\r
-char *CoverageManager::_memory = NULL;\r
-\r
-int read(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-       return CoverageManager::read(nameNumberHigh, nameNumberLow, size, id);\r
-}\r
-\r
-bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value) {\r
-       return CoverageManager::branch(nameNumberHigh, nameNumberLow, size, id, value);\r
-}\r
-\r
-void statement(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-       CoverageManager::statement(nameNumberHigh, nameNumberLow, size, id);\r
-}\r
diff --git a/SharedMemory/Java/CoverageManager.h b/SharedMemory/Java/CoverageManager.h
deleted file mode 100644 (file)
index ecc3ff6..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef COVERAGE_MANAGER_H_\r
-#define COVERAGE_MANAGER_H_\r
-\r
-#undef UNICODE\r
-#include <stdio.h>\r
-#include <windows.h>\r
-\r
-class CoverageManager\r
-{\r
-private:\r
-       static HANDLE _hMemory;\r
-       static char *_memory;\r
-       \r
-       static bool initialize(int nameNumberHigh, int nameNumberLow, int size) {\r
-               char name[256];\r
-               sprintf(name, "%d-%d-%d", nameNumberHigh, nameNumberLow, size);\r
-\r
-               _hMemory = CreateFileMapping(\r
-                       (HANDLE)-1,                     // \83t\83@\83C\83\8b\82Ì\83n\83\93\83h\83\8b(0xFFFFFFFF\82¾\82Æ\83t\83@\83C\83\8b\82ð\90\90¬\82µ\82È\82¢)\r
-                       NULL,                           // \83Z\83L\83\85\83\8a\83e\83B\r
-                       PAGE_READWRITE,         // \95Û\8cì\r
-                       0,                                      // \83T\83C\83Y\82ð\95\\82·\8fã\88Ê DWORD\r
-                       size,                           // \83T\83C\83Y\82ð\95\\82·\89º\88Ê DWORD\r
-                       name);                          // \83I\83u\83W\83F\83N\83g\96¼\81i\8e¯\95Ê\8eq\81j\r
-               if (GetLastError() == ERROR_ALREADY_EXISTS) {\r
-                       _hMemory = OpenFileMapping(\r
-                               FILE_MAP_ALL_ACCESS,    // \83A\83N\83Z\83X\83\82\81[\83h\r
-                               FALSE,                                  // \8cp\8f³\83t\83\89\83O\81i\8eq\83v\83\8d\83Z\83X\82É\8cp\8f³\82·\82é\82©\94Û\82©\81j\r
-                               name);                                  // \83I\83u\83W\83F\83N\83g\96¼\81i\8e¯\95Ê\8eq\81j\r
-               }\r
-               if (_hMemory == NULL)\r
-                       return false;\r
-\r
-               _memory = (char*)MapViewOfFile(\r
-                       _hMemory,                               // \83t\83@\83C\83\8b\83}\83b\83s\83\93\83O\83I\83u\83W\83F\83N\83g\82Ì\83n\83\93\83h\83\8b\r
-                       FILE_MAP_ALL_ACCESS,    // \83A\83N\83Z\83X\83\82\81[\83h\r
-                       0,                                              // \83I\83t\83Z\83b\83g\82Ì\8fã\88Ê DWORD\r
-                       0,                                              // \83I\83t\83Z\83b\83g\82Ì\89º\88Ê DWORD\r
-                       0);                                             // \83}\83b\83v\91Î\8fÛ\82Ì\83o\83C\83g\90\94\r
-               if (_memory == NULL)\r
-                       return false;\r
-               return true;\r
-       }\r
-\r
-       static void write(int nameNumberHigh, int nameNumberLow, int size, int id, char value) {\r
-               if (_memory == NULL && initialize(nameNumberHigh, nameNumberLow, size) == false) {\r
-                       return;\r
-               }\r
-               _memory[id] |= value;\r
-       }\r
-\r
-public:\r
-       static int read(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-               if (_memory == NULL && initialize(nameNumberHigh, nameNumberLow, size) == false) {\r
-                       return -1;\r
-               }\r
-               return _memory[id];\r
-       }\r
-       \r
-       static bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value) {\r
-               write(nameNumberHigh, nameNumberLow, size, id, value ? 1 : 2);\r
-               return value;\r
-       }\r
-       \r
-       static void statement(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-               write(nameNumberHigh, nameNumberLow, size, id, 3);\r
-       }\r
-};\r
-\r
-extern int read(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-extern bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value);\r
-extern void statement(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-\r
-#endif //COVERAGE_MANAGER_H_\r
diff --git a/SharedMemory/Java/CoverageManager.i b/SharedMemory/Java/CoverageManager.i
deleted file mode 100644 (file)
index 484d824..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-%module coverage_manager\r
-\r
-%{\r
-#include "CoverageManager.h"\r
-%}\r
-\r
-%include "CoverageManager.h"\r
diff --git a/SharedMemory/Java/Main.class b/SharedMemory/Java/Main.class
deleted file mode 100644 (file)
index 16ad2bb..0000000
Binary files a/SharedMemory/Java/Main.class and /dev/null differ
diff --git a/SharedMemory/Java/Main.java b/SharedMemory/Java/Main.java
deleted file mode 100644 (file)
index eb8bdde..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-public class Main {\r
-       public static void main(String argv[]) {\r
-               System.out.println("test");\r
-               CoverageManager.statement(0, 0, 100, 0);\r
-               System.out.println("test" + CoverageManager.read(0, 0, 100, 0));\r
-       }\r
-}\r
diff --git a/SharedMemory/Java/Stdafx.h b/SharedMemory/Java/Stdafx.h
deleted file mode 100644 (file)
index aeef9ea..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-// stdafx.h : \95W\8f\80\82Ì\83V\83X\83e\83\80 \83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\82Ì\83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\81A\82Ü\82½\82Í\r
-// \8eQ\8fÆ\89ñ\90\94\82ª\91½\82­\81A\82©\82Â\82 \82Ü\82è\95Ï\8dX\82³\82ê\82È\82¢\81A\83v\83\8d\83W\83F\83N\83g\90ê\97p\82Ì\83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\r
-// \82ð\8bL\8fq\82µ\82Ü\82·\81B\r
-\r
-#pragma once\r
-\r
-\r
diff --git a/SharedMemory/Java/memo.txt b/SharedMemory/Java/memo.txt
deleted file mode 100644 (file)
index 44d5544..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-swig -c++ -java CoverageManager.i\r
-cl /LD /I "C:\Program Files\Java\jdk1.6.0_16\include" /I "C:\Program Files\Java\jdk1.6.0_16\include\win32" *.cpp *.cxx\r
-javac *.java\r
diff --git a/SharedMemory/Python/CoverageManager.cpp b/SharedMemory/Python/CoverageManager.cpp
deleted file mode 100644 (file)
index 1414b69..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "stdafx.h"\r
-#include "CoverageManager.h"\r
-\r
-HANDLE CoverageManager::_hMemory = NULL;\r
-char *CoverageManager::_memory = NULL;\r
-\r
-int read(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-       return CoverageManager::read(nameNumberHigh, nameNumberLow, size, id);\r
-}\r
-\r
-bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value) {\r
-       return CoverageManager::branch(nameNumberHigh, nameNumberLow, size, id, value);\r
-}\r
-\r
-void statement(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-       CoverageManager::statement(nameNumberHigh, nameNumberLow, size, id);\r
-}\r
diff --git a/SharedMemory/Python/CoverageManager.h b/SharedMemory/Python/CoverageManager.h
deleted file mode 100644 (file)
index ecc3ff6..0000000
+++ /dev/null
@@ -1,74 +0,0 @@
-#ifndef COVERAGE_MANAGER_H_\r
-#define COVERAGE_MANAGER_H_\r
-\r
-#undef UNICODE\r
-#include <stdio.h>\r
-#include <windows.h>\r
-\r
-class CoverageManager\r
-{\r
-private:\r
-       static HANDLE _hMemory;\r
-       static char *_memory;\r
-       \r
-       static bool initialize(int nameNumberHigh, int nameNumberLow, int size) {\r
-               char name[256];\r
-               sprintf(name, "%d-%d-%d", nameNumberHigh, nameNumberLow, size);\r
-\r
-               _hMemory = CreateFileMapping(\r
-                       (HANDLE)-1,                     // \83t\83@\83C\83\8b\82Ì\83n\83\93\83h\83\8b(0xFFFFFFFF\82¾\82Æ\83t\83@\83C\83\8b\82ð\90\90¬\82µ\82È\82¢)\r
-                       NULL,                           // \83Z\83L\83\85\83\8a\83e\83B\r
-                       PAGE_READWRITE,         // \95Û\8cì\r
-                       0,                                      // \83T\83C\83Y\82ð\95\\82·\8fã\88Ê DWORD\r
-                       size,                           // \83T\83C\83Y\82ð\95\\82·\89º\88Ê DWORD\r
-                       name);                          // \83I\83u\83W\83F\83N\83g\96¼\81i\8e¯\95Ê\8eq\81j\r
-               if (GetLastError() == ERROR_ALREADY_EXISTS) {\r
-                       _hMemory = OpenFileMapping(\r
-                               FILE_MAP_ALL_ACCESS,    // \83A\83N\83Z\83X\83\82\81[\83h\r
-                               FALSE,                                  // \8cp\8f³\83t\83\89\83O\81i\8eq\83v\83\8d\83Z\83X\82É\8cp\8f³\82·\82é\82©\94Û\82©\81j\r
-                               name);                                  // \83I\83u\83W\83F\83N\83g\96¼\81i\8e¯\95Ê\8eq\81j\r
-               }\r
-               if (_hMemory == NULL)\r
-                       return false;\r
-\r
-               _memory = (char*)MapViewOfFile(\r
-                       _hMemory,                               // \83t\83@\83C\83\8b\83}\83b\83s\83\93\83O\83I\83u\83W\83F\83N\83g\82Ì\83n\83\93\83h\83\8b\r
-                       FILE_MAP_ALL_ACCESS,    // \83A\83N\83Z\83X\83\82\81[\83h\r
-                       0,                                              // \83I\83t\83Z\83b\83g\82Ì\8fã\88Ê DWORD\r
-                       0,                                              // \83I\83t\83Z\83b\83g\82Ì\89º\88Ê DWORD\r
-                       0);                                             // \83}\83b\83v\91Î\8fÛ\82Ì\83o\83C\83g\90\94\r
-               if (_memory == NULL)\r
-                       return false;\r
-               return true;\r
-       }\r
-\r
-       static void write(int nameNumberHigh, int nameNumberLow, int size, int id, char value) {\r
-               if (_memory == NULL && initialize(nameNumberHigh, nameNumberLow, size) == false) {\r
-                       return;\r
-               }\r
-               _memory[id] |= value;\r
-       }\r
-\r
-public:\r
-       static int read(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-               if (_memory == NULL && initialize(nameNumberHigh, nameNumberLow, size) == false) {\r
-                       return -1;\r
-               }\r
-               return _memory[id];\r
-       }\r
-       \r
-       static bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value) {\r
-               write(nameNumberHigh, nameNumberLow, size, id, value ? 1 : 2);\r
-               return value;\r
-       }\r
-       \r
-       static void statement(int nameNumberHigh, int nameNumberLow, int size, int id) {\r
-               write(nameNumberHigh, nameNumberLow, size, id, 3);\r
-       }\r
-};\r
-\r
-extern int read(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-extern bool branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value);\r
-extern void statement(int nameNumberHigh, int nameNumberLow, int size, int id);\r
-\r
-#endif //COVERAGE_MANAGER_H_\r
diff --git a/SharedMemory/Python/CoverageManager.i b/SharedMemory/Python/CoverageManager.i
deleted file mode 100644 (file)
index 484d824..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-%module coverage_manager\r
-\r
-%{\r
-#include "CoverageManager.h"\r
-%}\r
-\r
-%include "CoverageManager.h"\r
diff --git a/SharedMemory/Python/Stdafx.h b/SharedMemory/Python/Stdafx.h
deleted file mode 100644 (file)
index aeef9ea..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-// stdafx.h : \95W\8f\80\82Ì\83V\83X\83e\83\80 \83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\82Ì\83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\81A\82Ü\82½\82Í\r
-// \8eQ\8fÆ\89ñ\90\94\82ª\91½\82­\81A\82©\82Â\82 \82Ü\82è\95Ï\8dX\82³\82ê\82È\82¢\81A\83v\83\8d\83W\83F\83N\83g\90ê\97p\82Ì\83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\r
-// \82ð\8bL\8fq\82µ\82Ü\82·\81B\r
-\r
-#pragma once\r
-\r
-\r
diff --git a/SharedMemory/Python/memo.txt b/SharedMemory/Python/memo.txt
deleted file mode 100644 (file)
index 79eacd4..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-swig -c++ -python CoverageManager.i\r
-setup.py build_ext --swig-cpp\r
-build/lib.win32-2.5/_coverage_manager.pyd \82ð coverage_manager.py \82Æ\93¯\82\83t\83H\83\8b\83_\82É\92u\82­\r
-\r
-import os\r
-os.chdir("C:\Local\Projects\OpenCodeCoverageFramework\SharedMemory\Python")\r
-from coverage_manager import *\r
-statement(0, 0, 100, 0)\r
-read(0, 0, 100, 0)\r
diff --git a/SharedMemory/Python/setup.py b/SharedMemory/Python/setup.py
deleted file mode 100644 (file)
index 0725e05..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-from distutils.core import setup, Extension\r
-\r
-setup(\r
-  ext_modules = [\r
-    Extension('_coverage_manager', ['CoverageManager.i', 'CoverageManager.cpp'],\r
-      library_dirs=[],\r
-      libraries=[],\r
-      extra_compile_args=[],\r
-      extra_link_args=[])\r
-  ])\r
diff --git a/SharedMemory/ReadMe.txt b/SharedMemory/ReadMe.txt
deleted file mode 100644 (file)
index 0b67bec..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-===============================================================================\r
-    \83_\83C\83i\83~\83b\83\83\8a\83\93\83\83\89\83C\83u\83\89\83\8a: SharedMemory \83v\83\8d\83W\83F\83N\83g\82Ì\8aT\97v\r
-===============================================================================\r
-\r
-\82±\82Ì SharedMemory DLL \82Í\81AAppWizard \82É\82æ\82Á\82Ä\8dì\90¬\82³\82ê\82Ü\82µ\82½\81B  \r
-\r
-\82±\82Ì\83t\83@\83C\83\8b\82É\82Í\81ASharedMemory \83A\83v\83\8a\83P\81[\83V\83\87\83\93\82ð\8d\\90¬\82·\82é\8ae\83t\83@\83C\83\8b\82Ì\r
-\93à\97e\82Ì\8aT\97ª\82ª\8bL\8fq\82³\82ê\82Ä\82¢\82Ü\82·\81B\r
-\r
-SharedMemory.vcproj\r
-    \82±\82ê\82Í\81A\83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83E\83B\83U\81[\83h\82Å\90\90¬\82³\82ê\82é VC++ \83v\83\8d\83W\83F\83N\83g\82Ì\83\81\83C\83\93\82Ì\r
-    \83v\83\8d\83W\83F\83N\83\83t\83@\83C\83\8b\82Å\82·\81\r
-    \83t\83@\83C\83\8b\82ð\90\90¬\82µ\82½ Visual C++ \82Ì\83o\81[\83W\83\87\83\93\8fî\95ñ\82Æ\81A\83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83E\83B\83U\81[\r
-    \83h\82Å\91I\91ð\82µ\82½\83v\83\89\83b\83g\83t\83H\81[\83\80\81A\8d\\90¬\81A\82¨\82æ\82Ñ\83v\83\8d\83W\83F\83N\83g\82Ì\8b@\94\\82É\8aÖ\82·\82é\8fî\95ñ\82ª\r
-    \8bL\8fq\82³\82ê\82Ä\82¢\82Ü\82·\81B\r
-\r
-SharedMemory.cpp\r
-    \82±\82ê\82Í\81A\83\81\83C\83\93\82Ì DLL \83\\81[\83\83t\83@\83C\83\8b\82Å\82·\81B\r
-\r
-SharedMemory.h\r
-    \82±\82Ì\83t\83@\83C\83\8b\82É\82Í\81A\83N\83\89\83X\90é\8c¾\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82Ü\82·\81B\r
-\r
-AssemblyInfo.cpp\r
-       \83A\83Z\83\93\83u\83\8a \83\81\83^\83f\81[\83^\82ð\95Ï\8dX\82·\82é\82½\82ß\82Ì\83J\83X\83^\83\80\91®\90«\82ª\8aÜ\82Ü\82ê\82Ä\82¢\82Ü\82·\81B\r
-\r
-///////////////////////////////////////////////////////////////////////////////\r
-\82»\82Ì\91¼\82Ì\83\81\83\82 :\r
-\r
-AppWizard \82Å\82Í\81A"TODO:" \82ð\8eg\97p\82µ\82Ä\81A\83\86\81[\83U\81[\82ª\92Ç\89Á\82Ü\82½\82Í\83J\83X\83^\83}\83C\83Y\82·\82é\83\\81[\83X\r
-\95\94\95ª\82ð\8e¦\82µ\82Ü\82·\81B\r
-\r
-///////////////////////////////////////////////////////////////////////////////\r
diff --git a/SharedMemory/SharedMemory.cpp b/SharedMemory/SharedMemory.cpp
deleted file mode 100644 (file)
index d9b7bac..0000000
+++ /dev/null
@@ -1,6 +0,0 @@
-// \82±\82ê\82Í \83\81\83C\83\93 DLL \83t\83@\83C\83\8b\82Å\82·\81B\r
-\r
-#include "stdafx.h"\r
-\r
-#include "SharedMemory.h"\r
-\r
diff --git a/SharedMemory/SharedMemory.h b/SharedMemory/SharedMemory.h
deleted file mode 100644 (file)
index 03b055a..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-// SharedMemory.h\r
-\r
-#pragma once\r
-\r
-#include "CoverageManager.h"\r
-\r
-using namespace System;\r
-\r
-namespace SharedMemory {\r
-\r
-       public ref class CoverageManagerWrapper\r
-       {\r
-       public:\r
-               static int Read(int nameNumberHigh, int nameNumberLow, int size, int id)\r
-               {\r
-                       return CoverageManager::read(nameNumberHigh, nameNumberLow, size, id);\r
-               }\r
-\r
-               static bool Branch(int nameNumberHigh, int nameNumberLow, int size, int id, bool value)\r
-               {\r
-                       return CoverageManager::branch(nameNumberHigh, nameNumberLow, size, id, value);\r
-               }\r
-\r
-               static void Statement(int nameNumberHigh, int nameNumberLow, int size, int id)\r
-               {\r
-                       CoverageManager::statement(nameNumberHigh, nameNumberLow, size, id);\r
-               }\r
-       };\r
-}\r
diff --git a/SharedMemory/SharedMemory.vcproj b/SharedMemory/SharedMemory.vcproj
deleted file mode 100644 (file)
index 9f2346b..0000000
+++ /dev/null
@@ -1,260 +0,0 @@
-<?xml version="1.0" encoding="shift_jis"?>\r
-<VisualStudioProject\r
-       ProjectType="Visual C++"\r
-       Version="9.00"\r
-       Name="SharedMemory"\r
-       ProjectGUID="{3958C313-7307-47C4-A091-E1C7579A813A}"\r
-       RootNamespace="SharedMemory"\r
-       Keyword="ManagedCProj"\r
-       TargetFrameworkVersion="196613"\r
-       >\r
-       <Platforms>\r
-               <Platform\r
-                       Name="Win32"\r
-               />\r
-       </Platforms>\r
-       <ToolFiles>\r
-       </ToolFiles>\r
-       <Configurations>\r
-               <Configuration\r
-                       Name="Debug|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       ManagedExtensions="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               Optimization="0"\r
-                               PreprocessorDefinitions="WIN32;_DEBUG"\r
-                               RuntimeLibrary="3"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(NoInherit)"\r
-                               LinkIncremental="2"\r
-                               GenerateDebugInformation="true"\r
-                               AssemblyDebug="1"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-               <Configuration\r
-                       Name="Release|Win32"\r
-                       OutputDirectory="$(SolutionDir)$(ConfigurationName)"\r
-                       IntermediateDirectory="$(ConfigurationName)"\r
-                       ConfigurationType="2"\r
-                       CharacterSet="1"\r
-                       ManagedExtensions="1"\r
-                       WholeProgramOptimization="1"\r
-                       >\r
-                       <Tool\r
-                               Name="VCPreBuildEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCustomBuildTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXMLDataGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCWebServiceProxyGeneratorTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCMIDLTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCCLCompilerTool"\r
-                               PreprocessorDefinitions="WIN32;NDEBUG"\r
-                               RuntimeLibrary="2"\r
-                               UsePrecompiledHeader="2"\r
-                               WarningLevel="3"\r
-                               DebugInformationFormat="3"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManagedResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCResourceCompilerTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPreLinkEventTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCLinkerTool"\r
-                               AdditionalDependencies="$(NoInherit)"\r
-                               LinkIncremental="1"\r
-                               GenerateDebugInformation="true"\r
-                               TargetMachine="1"\r
-                       />\r
-                       <Tool\r
-                               Name="VCALinkTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCManifestTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCXDCMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCBscMakeTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCFxCopTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCAppVerifierTool"\r
-                       />\r
-                       <Tool\r
-                               Name="VCPostBuildEventTool"\r
-                       />\r
-               </Configuration>\r
-       </Configurations>\r
-       <References>\r
-               <AssemblyReference\r
-                       RelativePath="System.dll"\r
-                       AssemblyName="System, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"\r
-                       MinFrameworkVersion="131072"\r
-               />\r
-               <AssemblyReference\r
-                       RelativePath="System.Data.dll"\r
-                       AssemblyName="System.Data, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=x86"\r
-                       MinFrameworkVersion="131072"\r
-               />\r
-               <AssemblyReference\r
-                       RelativePath="System.XML.dll"\r
-                       AssemblyName="System.Xml, Version=2.0.0.0, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL"\r
-                       MinFrameworkVersion="131072"\r
-               />\r
-       </References>\r
-       <Files>\r
-               <Filter\r
-                       Name="\83\\81[\83\83t\83@\83C\83\8b"\r
-                       Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"\r
-                       UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\AssemblyInfo.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\CoverageManager.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\SharedMemory.cpp"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\Stdafx.cpp"\r
-                               >\r
-                               <FileConfiguration\r
-                                       Name="Debug|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                               <FileConfiguration\r
-                                       Name="Release|Win32"\r
-                                       >\r
-                                       <Tool\r
-                                               Name="VCCLCompilerTool"\r
-                                               UsePrecompiledHeader="1"\r
-                                       />\r
-                               </FileConfiguration>\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="\83w\83b\83_\81\83t\83@\83C\83\8b"\r
-                       Filter="h;hpp;hxx;hm;inl;inc;xsd"\r
-                       UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\CoverageManager.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\resource.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\SharedMemory.h"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\Stdafx.h"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <Filter\r
-                       Name="\83\8a\83\\81[\83\83t\83@\83C\83\8b"\r
-                       Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"\r
-                       UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"\r
-                       >\r
-                       <File\r
-                               RelativePath=".\app.ico"\r
-                               >\r
-                       </File>\r
-                       <File\r
-                               RelativePath=".\app.rc"\r
-                               >\r
-                       </File>\r
-               </Filter>\r
-               <File\r
-                       RelativePath=".\ReadMe.txt"\r
-                       >\r
-               </File>\r
-       </Files>\r
-       <Globals>\r
-       </Globals>\r
-</VisualStudioProject>\r
diff --git a/SharedMemory/Stdafx.cpp b/SharedMemory/Stdafx.cpp
deleted file mode 100644 (file)
index 9c099f8..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-// stdafx.cpp : \95W\8f\80\83C\83\93\83N\83\8b\81[\83h SharedMemory.pch \82Ì\82Ý\82ð\r
-// \8aÜ\82Þ\83\\81[\83\83t\83@\83C\83\8b\82Í\81A\83v\83\8a\83R\83\93\83p\83C\83\8b\8dÏ\82Ý\83w\83b\83_\81[\82É\82È\82è\82Ü\82·\81B\r
-// stdafx.obj \82É\82Í\83v\83\8a\83R\83\93\83p\83C\83\8b\8dÏ\82Ý\8c^\8fî\95ñ\82ª\8aÜ\82Ü\82ê\82Ü\82·\81B\r
-\r
-#include "stdafx.h"\r
diff --git a/SharedMemory/Stdafx.h b/SharedMemory/Stdafx.h
deleted file mode 100644 (file)
index aeef9ea..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-// stdafx.h : \95W\8f\80\82Ì\83V\83X\83e\83\80 \83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\82Ì\83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\81A\82Ü\82½\82Í\r
-// \8eQ\8fÆ\89ñ\90\94\82ª\91½\82­\81A\82©\82Â\82 \82Ü\82è\95Ï\8dX\82³\82ê\82È\82¢\81A\83v\83\8d\83W\83F\83N\83g\90ê\97p\82Ì\83C\83\93\83N\83\8b\81[\83\83t\83@\83C\83\8b\r
-// \82ð\8bL\8fq\82µ\82Ü\82·\81B\r
-\r
-#pragma once\r
-\r
-\r
diff --git a/SharedMemory/app.ico b/SharedMemory/app.ico
deleted file mode 100644 (file)
index 3a5525f..0000000
Binary files a/SharedMemory/app.ico and /dev/null differ
diff --git a/SharedMemory/app.rc b/SharedMemory/app.rc
deleted file mode 100644 (file)
index 2ad8e34..0000000
+++ /dev/null
@@ -1,63 +0,0 @@
-// Microsoft Visual C++ \82Å\90\90¬\82³\82ê\82½\83\8a\83\\81[\83\83X\83N\83\8a\83v\83g\82Å\82·\81B\r
-//\r
-#include "resource.h"\r
-\r
-#define APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-#undef APSTUDIO_READONLY_SYMBOLS\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-// \89p\8cê (\95Ä\8d\91\83\8a\83\\81[\83X\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// \83A\83C\83R\83\93\r
-//\r
-\r
-// \8dÅ\8f\89\82É\94z\92u\82³\82ê\82½\83A\83C\83R\83\93\81A\82Ü\82½\82Í ID \92l\82ª\8dÅ\82à\92á\82¢\83A\83C\83R\83\93\82ª\81A\83A\83v\83\8a\83P\81[\83V\83\87\83\93 \83A\83C\83R\83\93\82É\82È\82è\82Ü\82·\81B\r
-\r
-LANGUAGE 17, 1\r
-#pragma code_page(932)\r
-1           ICON         "app.ico"\r
-\r
-#ifdef APSTUDIO_INVOKED\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// TEXTINCLUDE\r
-//\r
-\r
-1 TEXTINCLUDE  \r
-BEGIN\r
-    "resource.h\0"\r
-    "\0"\r
-END\r
-\r
-2 TEXTINCLUDE  \r
-BEGIN\r
-    "#include ""afxres.h""\r\n"\r
-    "\0"\r
-END\r
-\r
-3 TEXTINCLUDE  \r
-BEGIN\r
-    "\0"\r
-END\r
-\r
-#endif    // APSTUDIO_INVOKED\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-\r
-\r
-\r
-#ifndef APSTUDIO_INVOKED\r
-/////////////////////////////////////////////////////////////////////////////\r
-//\r
-// TEXTINCLUDE 3 \83\8a\83\\81[\83X\82©\82ç\90\90¬\82³\82ê\82Ü\82µ\82½\81B\r
-//\r
-\r
-\r
-/////////////////////////////////////////////////////////////////////////////\r
-#endif    // APSTUDIO_INVOKED \82Å\82È\82¢\8fê\8d\87\r
-\r
diff --git a/SharedMemory/resource.h b/SharedMemory/resource.h
deleted file mode 100644 (file)
index 1f2251c..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-//{{NO_DEPENDENCIES}}\r
-// Microsoft Visual C++ generated include file.\r
-// Used by app.rc\r
diff --git a/Test/Program.cs b/Test/Program.cs
deleted file mode 100644 (file)
index 546995b..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-using System;\r
-using System.Collections.Generic;\r
-using System.Linq;\r
-using System.Text;\r
-using SharedMemory;\r
-\r
-namespace Test\r
-{\r
-       class Program\r
-       {\r
-               static void Main(string[] args)\r
-               {\r
-                       CoverageManagerWrapper.Statement(0, 0, 100, 0);\r
-                       Console.WriteLine(CoverageManagerWrapper.Read(0, 0, 100, 0));\r
-               }\r
-       }\r
-}\r
diff --git a/Test/Properties/AssemblyInfo.cs b/Test/Properties/AssemblyInfo.cs
deleted file mode 100644 (file)
index 7c6279f..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;\r
-using System.Runtime.CompilerServices;\r
-using System.Runtime.InteropServices;\r
-\r
-// アセンブリに関する一般情報は以下の属性セットをとおして制御されます。\r
-// アセンブリに関連付けられている情報を変更するには、\r
-// これらの属性値を変更してください。\r
-[assembly: AssemblyTitle("Test")]\r
-[assembly: AssemblyDescription("")]\r
-[assembly: AssemblyConfiguration("")]\r
-[assembly: AssemblyCompany("")]\r
-[assembly: AssemblyProduct("Test")]\r
-[assembly: AssemblyCopyright("Copyright ©  2009")]\r
-[assembly: AssemblyTrademark("")]\r
-[assembly: AssemblyCulture("")]\r
-\r
-// ComVisible を false に設定すると、その型はこのアセンブリ内で COM コンポーネントから \r
-// 参照不可能になります。COM からこのアセンブリ内の型にアクセスする場合は、\r
-// その型の ComVisible 属性を true に設定してください。\r
-[assembly: ComVisible(false)]\r
-\r
-// 次の GUID は、このプロジェクトが COM に公開される場合の、typelib の ID です\r
-[assembly: Guid("57b1b409-8677-4f0d-bde0-7d3a5e692a88")]\r
-\r
-// アセンブリのバージョン情報は、以下の 4 つの値で構成されています:\r
-//\r
-//      Major Version\r
-//      Minor Version \r
-//      Build Number\r
-//      Revision\r
-//\r
-// すべての値を指定するか、下のように '*' を使ってビルドおよびリビジョン番号を \r
-// 既定値にすることができます:\r
-// [assembly: AssemblyVersion("1.0.*")]\r
-[assembly: AssemblyVersion("1.0.0.0")]\r
-[assembly: AssemblyFileVersion("1.0.0.0")]\r
diff --git a/Test/Test.csproj b/Test/Test.csproj
deleted file mode 100644 (file)
index f3d12e7..0000000
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>\r
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-  <PropertyGroup>\r
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>\r
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-    <ProductVersion>9.0.30729</ProductVersion>\r
-    <SchemaVersion>2.0</SchemaVersion>\r
-    <ProjectGuid>{4FCDB9FE-A3F7-4005-A20B-DD971D591E8E}</ProjectGuid>\r
-    <OutputType>Exe</OutputType>\r
-    <AppDesignerFolder>Properties</AppDesignerFolder>\r
-    <RootNamespace>Test</RootNamespace>\r
-    <AssemblyName>Test</AssemblyName>\r
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>\r
-    <FileAlignment>512</FileAlignment>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">\r
-    <DebugSymbols>true</DebugSymbols>\r
-    <DebugType>full</DebugType>\r
-    <Optimize>false</Optimize>\r
-    <OutputPath>bin\Debug\</OutputPath>\r
-    <DefineConstants>DEBUG;TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">\r
-    <DebugType>pdbonly</DebugType>\r
-    <Optimize>true</Optimize>\r
-    <OutputPath>bin\Release\</OutputPath>\r
-    <DefineConstants>TRACE</DefineConstants>\r
-    <ErrorReport>prompt</ErrorReport>\r
-    <WarningLevel>4</WarningLevel>\r
-  </PropertyGroup>\r
-  <ItemGroup>\r
-    <Reference Include="System" />\r
-    <Reference Include="System.Core">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Xml.Linq">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Data.DataSetExtensions">\r
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>\r
-    </Reference>\r
-    <Reference Include="System.Data" />\r
-    <Reference Include="System.Xml" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <Compile Include="Program.cs" />\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
-  </ItemGroup>\r
-  <ItemGroup>\r
-    <ProjectReference Include="..\SharedMemory\SharedMemory.vcproj">\r
-      <Project>{3958C313-7307-47C4-A091-E1C7579A813A}</Project>\r
-      <Name>SharedMemory</Name>\r
-    </ProjectReference>\r
-  </ItemGroup>\r
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />\r
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-</Project>
\ No newline at end of file
index 0f7f305..39a5e50 100644 (file)
Binary files a/lib/Microsoft.Contracts.dll and b/lib/Microsoft.Contracts.dll differ
index 88684f0..0f2ea7f 100644 (file)
Binary files a/lib/Paraiba.dll and b/lib/Paraiba.dll differ