From 1e2ecf8c492b6d499880b8676e3c1fe0c5793103 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gustavsson?= <bjorn@erlang.org>
Date: Tue, 16 Mar 2010 07:34:49 +0000
Subject: Remove stray code supporting 'cond'

'cond' is an experimental feature that was never completed.
---
 lib/stdlib/src/erl_expand_records.erl |  3 ---
 lib/stdlib/src/erl_lint.erl           | 41 -----------------------------------
 lib/stdlib/src/erl_parse.yrl          | 19 +++++-----------
 3 files changed, 5 insertions(+), 58 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/src/erl_expand_records.erl b/lib/stdlib/src/erl_expand_records.erl
index 9c55fa96d1..a38b7639d8 100644
--- a/lib/stdlib/src/erl_expand_records.erl
+++ b/lib/stdlib/src/erl_expand_records.erl
@@ -345,9 +345,6 @@ expr({'fun',Line,{clauses,Cs0}}, St0) ->
     {{'fun',Line,{clauses,Cs}},St1};
 expr({call,Line,{atom,_,is_record},[A,{atom,_,Name}]}, St) ->
     record_test(Line, A, Name, St);
-expr({'cond',Line,Cs0}, St0) ->
-    {Cs,St1} = clauses(Cs0, St0),
-    {{'cond',Line,Cs},St1};
 expr({call,Line,{remote,_,{atom,_,erlang},{atom,_,is_record}},
       [A,{atom,_,Name}]}, St) ->
     record_test(Line, A, Name, St);
diff --git a/lib/stdlib/src/erl_lint.erl b/lib/stdlib/src/erl_lint.erl
index 22f435aff8..94ad560549 100644
--- a/lib/stdlib/src/erl_lint.erl
+++ b/lib/stdlib/src/erl_lint.erl
@@ -1940,8 +1940,6 @@ expr({'case',Line,E,Cs}, Vt, St0) ->
     {Evt,St1} = expr(E, Vt, St0),
     {Cvt,St2} = icrt_clauses(Cs, {'case',Line}, vtupdate(Evt, Vt), St1),
     {vtmerge(Evt, Cvt),St2};
-expr({'cond',Line,Cs}, Vt, St) ->
-    cond_clauses(Cs,{'cond',Line}, Vt, St);
 expr({'receive',Line,Cs}, Vt, St) ->
     icrt_clauses(Cs, {'receive',Line}, Vt, St);
 expr({'receive',Line,Cs,To,ToEs}, Vt, St0) ->
@@ -2717,45 +2715,6 @@ icrt_clause({clause,_Line,H,G,B}, Vt0, St0) ->
     {Bvt,St3} = exprs(B, Vt2, St2),
     {vtupdate(Bvt, Vt2),St3}.
 
-%% The tests of 'cond' clauses are normal expressions - not guards.
-%% Variables bound in a test is visible both in the corresponding body
-%% and in the tests and bodies of subsequent clauses: a 'cond' is
-%% *equivalent* to nested case-switches on boolean expressions.
-
-cond_clauses([C], In, Vt, St) ->
-    last_cond_clause(C, In, Vt, St);
-cond_clauses([C | Cs], In, Vt, St) ->
-    cond_clause(C, Cs, In, Vt, St).
-
-%% see expr/3 for 'case'
-cond_clause({clause,_L,[],[[E]],B}, Cs, In, Vt, St0) ->
-    {Evt,St1} = expr(E, Vt, St0),
-    {Cvt, St2} = cond_cases(B, Cs, In, vtupdate(Evt, Vt), St1),
-    Mvt = vtmerge(Evt, Cvt),
-    {Mvt,St2}.
-
-%% see icrt_clauses/4
-cond_cases(B, Cs, In, Vt, St0) ->
-    %% note that Vt is used for both cases
-    {Bvt,St1} = exprs(B, Vt, St0), % true case
-    Vt1 = vtupdate(Bvt, Vt),
-    {Cvt, St2} = cond_clauses(Cs, In, Vt, St1), % false case
-    Vt2 = vtupdate(Cvt, Vt),
-    %% and this also uses Vt
-    icrt_export([Vt1,Vt2], Vt, In, St2).
-
-%% last case must call icrt_export/4 with only one vartable
-last_cond_clause({clause,_L,[],[[E]],B}, In, Vt, St0) ->
-    {Evt,St1} = expr(E, Vt, St0),
-    {Cvt, St2} = last_cond_case(B, In, vtupdate(Evt, Vt), St1),
-    Mvt = vtmerge(Evt, Cvt),
-    {Mvt,St2}.
-
-last_cond_case(B, In, Vt, St0) ->
-    {Bvt,St1} = exprs(B, Vt, St0),
-    Vt1 = vtupdate(Bvt, Vt),
-    icrt_export([Vt1], Vt, In, St1).
-
 icrt_export(Csvt, Vt, In, St) ->
     Vt1 = vtmerge(Csvt),
     All = ordsets:subtract(vintersection(Csvt), vtnames(Vt)),
diff --git a/lib/stdlib/src/erl_parse.yrl b/lib/stdlib/src/erl_parse.yrl
index fd5d905797..435464227f 100644
--- a/lib/stdlib/src/erl_parse.yrl
+++ b/lib/stdlib/src/erl_parse.yrl
@@ -1,20 +1,20 @@
 %% -*- erlang -*-
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 1996-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 1996-2010. All Rights Reserved.
+%%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -57,7 +57,6 @@ char integer float atom string var
 '(' ')' ',' '->' ':-' '{' '}' '[' ']' '|' '||' '<-' ';' ':' '#' '.'
 'after' 'begin' 'case' 'try' 'catch' 'end' 'fun' 'if' 'of' 'receive' 'when'
 'andalso' 'orelse' 'query' 'spec'
-%% 'cond'
 'bnot' 'not'
 '*' '/' 'div' 'rem' 'band' 'and'
 '+' '-' 'bor' 'bxor' 'bsl' 'bsr' 'or' 'xor'
@@ -422,14 +421,6 @@ try_clause -> var ':' expr clause_guard clause_body :
 	L = ?line('$1'),
 	{clause,L,[{tuple,L,['$1','$3',{var,L,'_'}]}],'$4','$5'}.
 
-%%cond_expr -> 'cond' cond_clauses 'end' : {'cond',?line('$1'),'$2'}.
-
-%%cond_clauses -> cond_clause : ['$1'].
-%%cond_clauses -> cond_clause ';' cond_clauses : ['$1' | '$3'].
-
-%%cond_clause -> expr clause_body :
-%%	{clause,?line('$1'),[],[['$1']],'$2'}.
-
 query_expr -> 'query' list_comprehension 'end' :
 	{'query',?line('$1'),'$2'}.
 
-- 
cgit v1.2.3