masterの差異を吸収.

[omake-japanese/omake_trans.git] / language-naming.rst

diff --git a/language-naming.rst b/language-naming.rst
index 710ed85..78209e1 100644 (file)
--- a/language-naming.rst
+++ b/language-naming.rst
@@ -5,7 +5,7 @@
    single: 名前空間
 .. _label5:
 
-変数と名前空間
+5. 変数と名前空間
 ==================================
 .. During evaluation, there are three different kinds of namespaces. Variables can be private, or they may refer to fields in the current this object, or they can be part of the global namespace. The namespace can be specified directly by including an explicit qualifier before the variable name. The three namespaces are separate; a variable can be bound in one or more simultaneously.
 
@@ -23,7 +23,7 @@
    single: export
 .. _label5.1:
 
-private.
+5.1 private.
 ----------------------------------
 .. The private. qualifier is used to define variables that are private to the current file/scope. The values are not accessible outside the scope. Private variables are statically (lexically) scoped.
 
@@ -92,7 +92,7 @@ private.
    single: this.
 .. _label5.2:
 
-this.
+5.2 this.
 ----------------------------------
 .. The this. qualifier is used to define fields that are local to an object. Object variables are dynamically scoped.
 
@@ -132,7 +132,7 @@ this.
    single: global.
 .. _label5.3:
 
-global.
+5.3 global.
 ----------------------------------
 .. The global. qualifier is used to specify global dynamically-scoped variables. In the following example, the global. definition specifies that the binding X = 4 is to be dynamically scoped. Global variables are not defined as fields of an object.
 
@@ -165,7 +165,7 @@ global.
    single: protected.
 .. _label5.4:
 
-protected.
+5.4 protected.
 ----------------------------------
 .. In OMake 0.9.8, protected is a synonym for this.
 
@@ -184,7 +184,7 @@ OMake 0.9.8では、 ``protected`` は ``this`` 修飾子と同義語でした
    single: public.
 .. _label5.5:
 
-public.
+5.5 public.
 ----------------------------------
 .. In OMake 0.9.8, public is a synonym for global.
 
@@ -201,7 +201,7 @@ OMake 0.9.8では、 ``public`` は ``global`` 修飾子と同義語でした。
 
 .. _label5.6:
 
-修飾されたブロック
+5.6 修飾されたブロック
 ----------------------------------
 .. If several qualified variables are defined simultaneously, a block form of qualifier can be defined. The syntax is similar to an object definition, where the name of the object is the qualifier itself. For example, the following program defines two private variables X and Y.
 
@@ -227,7 +227,7 @@ OMake 0.9.8では、 ``public`` は ``global`` 修飾子と同義語でした。
    single: 明示的に修飾されていない変数
 .. _label5.7:
 
-変数宣言
+5.7 変数宣言
 ----------------------------------
 .. When a variable name is unqualified, its namespace is determined by the most recent definition or declaration that is in scope for that variable. We have already seen this in the examples, where a variable definition is qualified, but the subsequent uses are not qualified explicitly. In the following example, the first occurrence of $X refers to the private definition, because that is the most recent. The public definition of X is still 0, but the variable must be qualified explicitly.