From a1368a6ad0f413c57b2487806c7058146b21678b Mon Sep 17 00:00:00 2001 From: Robert Griesemer Date: Tue, 22 Feb 2011 15:31:57 -0800 Subject: [PATCH] go spec: make condition mandatory in if statements Plus a few minor HTML fixes. Fixes #1535. R=r, rsc, ken2, iant, r2 CC=golang-dev https://golang.org/cl/4185065 --- doc/go_spec.html | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/doc/go_spec.html b/doc/go_spec.html index 54fa50421e..25eb3c4644 100644 --- a/doc/go_spec.html +++ b/doc/go_spec.html @@ -2744,7 +2744,7 @@ and finally || (logical or): Precedence Operator 5 * / % << >> & &^ 4 + - | ^ - 3 == != < <= > >= + 3 == != < <= > >= 2 && 1 || @@ -2760,7 +2760,7 @@ For instance, x / y * z is the same as (x / y) * z. x <= f() ^a >> b f() || g() -x == y+1 && <-chan_ptr > 0 +x == y+1 && <-chan_ptr > 0 @@ -3686,17 +3686,16 @@ complex, or string constant. "If" statements specify the conditional execution of two branches according to the value of a boolean expression. If the expression evaluates to true, the "if" branch is executed, otherwise, if -present, the "else" branch is executed. A missing condition -is equivalent to true. +present, the "else" branch is executed.

-IfStmt    = "if" [ SimpleStmt ";" ] [ Expression ] Block [ "else" Statement ] .
+IfStmt    = "if" [ SimpleStmt ";" ] Expression Block [ "else" Statement ] .
 
-if x > 0 {
-	return true;
+if x > max {
+	x = max
 }
 
@@ -3708,7 +3707,7 @@ executes before the expression is evaluated.
 if x := f(); x < y {
 	return x
-} else if x > z {
+} else if x > z {
 	return z
 } else {
 	return y
-- 
2.48.1