diff options
author | Erlang/OTP <[email protected]> | 2010-03-25 14:23:21 +0000 |
---|---|---|
committer | Erlang/OTP <[email protected]> | 2010-03-25 14:23:21 +0000 |
commit | 7ffd0736fa636a871b39412ab037d7fb1ed04cf1 (patch) | |
tree | 9d57389bc0f41dcaaeaea445a059b4458f9bd797 /lib/compiler/src/v3_life.erl | |
parent | 01d605fdb7c396b5c98a9151baf3882930d0c6af (diff) | |
parent | d179c1522c73de550bce45c7f5d5055e04b93f32 (diff) | |
download | otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.gz otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.tar.bz2 otp-7ffd0736fa636a871b39412ab037d7fb1ed04cf1.zip |
Merge branch 'bg/compiler-remove-r11-support' into dev
* bg/compiler-remove-r11-support:
compiler: Don't support the no_binaries option
erts: Don't support the put_string/3 instruction
compiler: Don't support the no_constant_pool option
compiler: Don't support the r11 option
test_server: Don't support communication with R11 nodes
binary_SUITE: Don't test bit-level binary roundtrips with R11 nodes
erts: Test compatibility of funs with R12 instead of R11
OTP-8531 bg/compiler-remove-r11-support
Diffstat (limited to 'lib/compiler/src/v3_life.erl')
-rw-r--r-- | lib/compiler/src/v3_life.erl | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/compiler/src/v3_life.erl b/lib/compiler/src/v3_life.erl index 8e6b153d57..9fda37530b 100644 --- a/lib/compiler/src/v3_life.erl +++ b/lib/compiler/src/v3_life.erl @@ -418,7 +418,6 @@ literal(#k_int{val=I}, _) -> {integer,I}; literal(#k_float{val=F}, _) -> {float,F}; literal(#k_atom{val=N}, _) -> {atom,N}; %%literal(#k_char{val=C}, _) -> {char,C}; -literal(#k_string{val=S}, _) -> {string,S}; literal(#k_nil{}, _) -> nil; literal(#k_cons{hd=H,tl=T}, Ctxt) -> {cons,[literal(H, Ctxt),literal(T, Ctxt)]}; @@ -443,7 +442,6 @@ literal2(#k_int{val=I}, _) -> {integer,I}; literal2(#k_float{val=F}, _) -> {float,F}; literal2(#k_atom{val=N}, _) -> {atom,N}; %%literal2(#k_char{val=C}, _) -> {char,C}; -literal2(#k_string{val=S}, _) -> {string,S}; literal2(#k_nil{}, _) -> nil; literal2(#k_cons{hd=H,tl=T}, Ctxt) -> {cons,[literal2(H, Ctxt),literal2(T, Ctxt)]}; |