diff --git a/clang-tools-extra/clang-doc/assets/class-template.mustache b/clang-tools-extra/clang-doc/assets/class-template.mustache index a320a938a91ff..8eb28f33e65f6 100644 --- a/clang-tools-extra/clang-doc/assets/class-template.mustache +++ b/clang-tools-extra/clang-doc/assets/class-template.mustache @@ -174,7 +174,7 @@

Public Methods

{{#PublicFunctions}} -{{>FunctionPartial}} + {{>FunctionPartial}} {{/PublicFunctions}}
diff --git a/clang-tools-extra/clang-doc/assets/comment-template.mustache b/clang-tools-extra/clang-doc/assets/comment-template.mustache index d374c715296d0..1f40333cfd4b2 100644 --- a/clang-tools-extra/clang-doc/assets/comment-template.mustache +++ b/clang-tools-extra/clang-doc/assets/comment-template.mustache @@ -6,61 +6,61 @@ This file defines templates for generating comments }} {{#BriefComments}} -
- {{#.}} -

{{TextComment}}

- {{/.}} -
+
+{{#.}} +

{{TextComment}}

+{{/.}} +
{{/BriefComments}} {{#ParagraphComments}} -
- {{#.}} -

{{TextComment}}

- {{/.}} -
+
+{{#.}} +

{{TextComment}}

+{{/.}} +
{{/ParagraphComments}} {{#ParagraphComment}} - {{#Children}} - {{>Comments}} - {{/Children}} +{{#Children}} +{{TextComment}} +{{/Children}} {{/ParagraphComment}} {{#HasParamComments}} -

Parameters

- {{#ParamComments}} -
- {{ParamName}} {{#Explicit}}{{Direction}}{{/Explicit}} {{#Children}}{{>Comments}}{{/Children}} -
- {{/ParamComments}} +

Parameters

+{{#ParamComments}} +
+ {{ParamName}} {{#Explicit}}{{Direction}}{{/Explicit}} {{#Children}}{{TextComment}}{{/Children}} +
+{{/ParamComments}} {{/HasParamComments}} {{#HasReturnComments}} -

Returns

- {{#ReturnComments}} - {{#.}} -

{{TextComment}}

- {{/.}} - {{/ReturnComments}} +

Returns

+{{#ReturnComments}} +{{#.}} +

{{TextComment}}

+{{/.}} +{{/ReturnComments}} {{/HasReturnComments}} {{#HasCodeComments}} -

Code

- {{#CodeComments}} -
-
-            
-            {{#.}}
+

Code

+{{#CodeComments}} +
+
+        
+        {{#.}}
             {{.}}
-            {{/.}}
-            
-        
-
- {{/CodeComments}} + {{/.}} +
+
+
+{{/CodeComments}} {{/HasCodeComments}} {{#HasThrowsComments}} -

Throws

- {{#ThrowsComments}} -
- {{Exception}} {{#Children}}{{TextComment}}{{/Children}} -
- {{/ThrowsComments}} +

Throws

+{{#ThrowsComments}} +
+ {{Exception}} {{#Children}}{{TextComment}}{{/Children}} +
+{{/ThrowsComments}} {{/HasThrowsComments}} {{#BlockCommandComment}}
@@ -74,8 +74,3 @@
{{/BlockCommandComment}} -{{#TextComment}} -
-

{{TextComment}}

-
-{{/TextComment}} diff --git a/clang-tools-extra/clang-doc/assets/function-template.mustache b/clang-tools-extra/clang-doc/assets/function-template.mustache index 2510a4de2cd68..dc787bf0c8694 100644 --- a/clang-tools-extra/clang-doc/assets/function-template.mustache +++ b/clang-tools-extra/clang-doc/assets/function-template.mustache @@ -8,11 +8,7 @@
{{! Function Prototype }} -
-            
-{{ReturnType.Name}} {{Name}} ({{#Params}}{{^End}}{{Type}} {{Name}}, {{/End}}{{#End}}{{Type}} {{Name}}{{/End}}{{/Params}})
-            
-        
+
{{ReturnType.Name}} {{Name}} ({{#Params}}{{^End}}{{Type}} {{Name}}, {{/End}}{{#End}}{{Type}} {{Name}}{{/End}}{{/Params}})
{{! Function Comments }} {{#Description}}
diff --git a/clang-tools-extra/test/clang-doc/basic-project.mustache.test b/clang-tools-extra/test/clang-doc/basic-project.mustache.test index a3041336327e8..9f7de6e689313 100644 --- a/clang-tools-extra/test/clang-doc/basic-project.mustache.test +++ b/clang-tools-extra/test/clang-doc/basic-project.mustache.test @@ -60,84 +60,72 @@ HTML-SHAPE:
HTML-SHAPE:
HTML-SHAPE:
HTML-SHAPE:

class Shape

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

Abstract base class for shapes.

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

Provides a common interface for different types of shapes.

-HTML-SHAPE:
-HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

Abstract base class for shapes.

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

Provides a common interface for different types of shapes.

+HTML-SHAPE:
+HTML-SHAPE:
HTML-SHAPE:
HTML-SHAPE:
HTML-SHAPE:
HTML-SHAPE:

Public Methods

HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:             
-HTML-SHAPE: double area ()
-HTML-SHAPE:             
-HTML-SHAPE:         
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

Calculates the area of the shape.

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

-HTML-SHAPE:
-HTML-SHAPE:

Returns

-HTML-SHAPE:

double The area of the shape.

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:             
-HTML-SHAPE: double perimeter ()
-HTML-SHAPE:             
-HTML-SHAPE:         
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

Calculates the perimeter of the shape.

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

-HTML-SHAPE:
-HTML-SHAPE:

Returns

-HTML-SHAPE:

double The perimeter of the shape.

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:             
-HTML-SHAPE: void ~Shape ()
-HTML-SHAPE:             
-HTML-SHAPE:         
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

Virtual destructor.

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:

-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
-HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
double area ()
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

Calculates the area of the shape.

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

+HTML-SHAPE:
+HTML-SHAPE:

Returns

+HTML-SHAPE:

double The area of the shape.

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
double perimeter ()
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

Calculates the perimeter of the shape.

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

+HTML-SHAPE:
+HTML-SHAPE:

Returns

+HTML-SHAPE:

double The perimeter of the shape.

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
void ~Shape ()
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

Virtual destructor.

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:

+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
+HTML-SHAPE:
HTML-SHAPE: HTML-SHAPE:
HTML-SHAPE:
@@ -217,219 +205,164 @@ HTML-CALC:
HTML-CALC:
HTML-CALC:
HTML-CALC:

class Calculator

-HTML-CALC:
-HTML-CALC:

A simple calculator class.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Provides basic arithmetic operations.

-HTML-CALC:
-HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

A simple calculator class.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

Provides basic arithmetic operations.

+HTML-CALC:
+HTML-CALC:
HTML-CALC:
HTML-CALC: HTML-CALC:
HTML-CALC:

Public Members

HTML-CALC:
HTML-CALC:
-HTML-CALC:
-HTML-CALC: int public_val
-HTML-CALC:                         
+HTML-CALC:
int public_val
HTML-CALC:
HTML-CALC:
-HTML-CALC:
-HTML-CALC: const int static_val
-HTML-CALC:                         
+HTML-CALC:
const int static_val
HTML-CALC:
HTML-CALC:
HTML-CALC:
HTML-CALC:
HTML-CALC:

Public Methods

HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:             
-HTML-CALC: int add (int a, int b)
-HTML-CALC:             
-HTML-CALC:         
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Adds two integers.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:

Parameters

-HTML-CALC:
-HTML-CALC: a
-HTML-CALC:

First integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC: b
-HTML-CALC:

Second integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Returns

-HTML-CALC:

int The sum of a and b.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:             
-HTML-CALC: int subtract (int a, int b)
-HTML-CALC:             
-HTML-CALC:         
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Subtracts the second integer from the first.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:

Returns

-HTML-CALC:

int The result of a - b.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:             
-HTML-CALC: int multiply (int a, int b)
-HTML-CALC:             
-HTML-CALC:         
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Multiplies two integers.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:

Parameters

-HTML-CALC:
-HTML-CALC: a
-HTML-CALC:

First integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC: b
-HTML-CALC:

Second integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Returns

-HTML-CALC:

int The product of a and b.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:             
-HTML-CALC: double divide (int a, int b)
-HTML-CALC:             
-HTML-CALC:         
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Divides the first integer by the second.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:

Parameters

-HTML-CALC:
-HTML-CALC: a
-HTML-CALC:

First integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC: b
-HTML-CALC:

Second integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Returns

-HTML-CALC:

double The result of a / b.

-HTML-CALC:

-HTML-CALC:

Throws

-HTML-CALC:
-HTML-CALC: std::invalid_argument if b is zero. -HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:             
-HTML-CALC: int mod (int a, int b)
-HTML-CALC:             
-HTML-CALC:         
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Performs the mod operation on integers.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:

Parameters

-HTML-CALC:
-HTML-CALC: a
-HTML-CALC:

First integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC: b
-HTML-CALC:

Second integer.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:

Returns

-HTML-CALC:

The result of a % b.

-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
-HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
int add (int a, int b)
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

Adds two integers.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:

Parameters

+HTML-CALC:
+HTML-CALC: a First integer. +HTML-CALC:
+HTML-CALC:
+HTML-CALC: b Second integer. +HTML-CALC:
+HTML-CALC:

Returns

+HTML-CALC:

int The sum of a and b.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
int subtract (int a, int b)
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

Subtracts the second integer from the first.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:

Parameters

+HTML-CALC:
+HTML-CALC: a First integer. +HTML-CALC:
+HTML-CALC:
+HTML-CALC: b Second integer. +HTML-CALC:
+HTML-CALC:

Returns

+HTML-CALC:

int The result of a - b.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
int multiply (int a, int b)
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

Multiplies two integers.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:

Parameters

+HTML-CALC:
+HTML-CALC: a First integer. +HTML-CALC:
+HTML-CALC:
+HTML-CALC: b Second integer. +HTML-CALC:
+HTML-CALC:

Returns

+HTML-CALC:

int The product of a and b.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
double divide (int a, int b)
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

Divides the first integer by the second.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:

Parameters

+HTML-CALC:
+HTML-CALC: a First integer. +HTML-CALC:
+HTML-CALC:
+HTML-CALC: b Second integer. +HTML-CALC:
+HTML-CALC:

Returns

+HTML-CALC:

double The result of a / b.

+HTML-CALC:

+HTML-CALC:

Throws

+HTML-CALC:
+HTML-CALC: std::invalid_argument if b is zero. +HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
int mod (int a, int b)
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

Performs the mod operation on integers.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:

+HTML-CALC:
+HTML-CALC:

Parameters

+HTML-CALC:
+HTML-CALC: a First integer. +HTML-CALC:
+HTML-CALC:
+HTML-CALC: b Second integer. +HTML-CALC:
+HTML-CALC:

Returns

+HTML-CALC:

The result of a % b.

+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
+HTML-CALC:
HTML-CALC:
HTML-CALC:
HTML-CALC: @@ -438,6 +371,7 @@ HTML-CALC: HTML-CALC: + HTML-RECTANGLE: HTML-RECTANGLE: HTML-RECTANGLE: @@ -492,101 +426,82 @@ HTML-RECTANGLE:
HTML-RECTANGLE:
HTML-RECTANGLE:
HTML-RECTANGLE:

class Rectangle

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

Rectangle class derived from Shape.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

Represents a rectangle with a given width and height.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

Rectangle class derived from Shape.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

Represents a rectangle with a given width and height.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
HTML-RECTANGLE:
HTML-RECTANGLE:
HTML-RECTANGLE:
HTML-RECTANGLE:

Public Methods

HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:             
-HTML-RECTANGLE: void Rectangle (double width, double height)
-HTML-RECTANGLE:             
-HTML-RECTANGLE:         
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

Constructs a new Rectangle object.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:

Parameters

-HTML-RECTANGLE:
-HTML-RECTANGLE: width
-HTML-RECTANGLE:

Width of the rectangle.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE: height
-HTML-RECTANGLE:

Height of the rectangle.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:             
-HTML-RECTANGLE: double area ()
-HTML-RECTANGLE:             
-HTML-RECTANGLE:         
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

Calculates the area of the rectangle.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:

Returns

-HTML-RECTANGLE:

double The area of the rectangle.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:             
-HTML-RECTANGLE: double perimeter ()
-HTML-RECTANGLE:             
-HTML-RECTANGLE:         
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

Calculates the perimeter of the rectangle.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:

-HTML-RECTANGLE:
-HTML-RECTANGLE:

Returns

-HTML-RECTANGLE:

double The perimeter of the rectangle.

-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
-HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
void Rectangle (double width, double height)
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

Constructs a new Rectangle object.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:

Parameters

+HTML-RECTANGLE:
+HTML-RECTANGLE: width Width of the rectangle. +HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE: height Height of the rectangle. +HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
double area ()
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

Calculates the area of the rectangle.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:

Returns

+HTML-RECTANGLE:

double The area of the rectangle.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
double perimeter ()
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

Calculates the perimeter of the rectangle.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:

+HTML-RECTANGLE:
+HTML-RECTANGLE:

Returns

+HTML-RECTANGLE:

double The perimeter of the rectangle.

+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
+HTML-RECTANGLE:
HTML-RECTANGLE: HTML-RECTANGLE: HTML-RECTANGLE: @@ -595,6 +510,7 @@ HTML-RECTANGLE: HTML-RECTANGLE: + HTML-CIRCLE: HTML-CIRCLE: HTML-CIRCLE: @@ -649,102 +565,91 @@ HTML-CIRCLE:
HTML-CIRCLE:
HTML-CIRCLE:
HTML-CIRCLE:

class Circle

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

Circle class derived from Shape.

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

Represents a circle with a given radius.

-HTML-CIRCLE:
-HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

Circle class derived from Shape.

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

Represents a circle with a given radius.

+HTML-CIRCLE:
+HTML-CIRCLE:
HTML-CIRCLE:
HTML-CIRCLE:
HTML-CIRCLE:
HTML-CIRCLE:

Public Methods

HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:             
-HTML-CIRCLE: void Circle (double radius)
-HTML-CIRCLE:             
-HTML-CIRCLE:         
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

Constructs a new Circle object.

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:

Parameters

-HTML-CIRCLE:
-HTML-CIRCLE: radius
-HTML-CIRCLE:

Radius of the circle.

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:             
-HTML-CIRCLE: double area ()
-HTML-CIRCLE:             
-HTML-CIRCLE:         
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

Calculates the area of the circle.

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:

Returns

-HTML-CIRCLE:

double The area of the circle.

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:             
-HTML-CIRCLE: double perimeter ()
-HTML-CIRCLE:             
-HTML-CIRCLE:         
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

Calculates the perimeter of the circle.

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:

-HTML-CIRCLE:
-HTML-CIRCLE:

Returns

-HTML-CIRCLE:

double The perimeter of the circle.

-HTML-CIRCLE:

Code

-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:                            
-HTML-CIRCLE:                            Circle circle(5.0);
-HTML-CIRCLE:                            double perimeter = circle.perimeter();
-HTML-CIRCLE:                            
-HTML-CIRCLE:                        
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
-HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
void Circle (double radius)
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

Constructs a new Circle object.

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:

Parameters

+HTML-CIRCLE:
+HTML-CIRCLE: radius Radius of the circle. +HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
double area ()
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

Calculates the area of the circle.

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:

Returns

+HTML-CIRCLE:

double The area of the circle.

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
double perimeter ()
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

Calculates the perimeter of the circle.

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:

+HTML-CIRCLE:
+HTML-CIRCLE:

Returns

+HTML-CIRCLE:

double The perimeter of the circle.

+HTML-CIRCLE:

Code

+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:                                         
+HTML-CIRCLE:                                              Circle circle(5.0);
+HTML-CIRCLE:                                              double perimeter = circle.perimeter();
+HTML-CIRCLE:                                         
+HTML-CIRCLE:                                     
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
+HTML-CIRCLE:
HTML-CIRCLE: HTML-CIRCLE: HTML-CIRCLE: