From 0994710c308990a04ca1245c894e4e373e55bcec Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang-solutions.com>
Date: Wed, 22 Aug 2012 18:09:17 +0200
Subject: Revert "Merge branch 'nox/compile-column-numbers' into maint"

Column numbers was merged without understanding all the whole
story. See mail on erlang-patches for details.

This reverts commit df8e67e203b83f95d1e098fec88ad5d0ad840069, reversing
changes made to 0c9d90f314f364e5b1301ec89d762baabc57c7aa.
---
 lib/stdlib/doc/src/epp.xml  |  2 --
 lib/stdlib/src/epp.erl      | 44 +++++++++-----------------------------------
 lib/stdlib/src/erl_scan.erl |  2 +-
 3 files changed, 10 insertions(+), 38 deletions(-)

(limited to 'lib/stdlib')

diff --git a/lib/stdlib/doc/src/epp.xml b/lib/stdlib/doc/src/epp.xml
index a57c7084fa..488499581f 100644
--- a/lib/stdlib/doc/src/epp.xml
+++ b/lib/stdlib/doc/src/epp.xml
@@ -51,7 +51,6 @@
     <func>
       <name name="open" arity="2"/>
       <name name="open" arity="3"/>
-      <name name="open" arity="4"/>
       <fsummary>Open a file for preprocessing</fsummary>
       <desc>
         <p>Opens a file for preprocessing.</p>
@@ -76,7 +75,6 @@
     </func>
     <func>
       <name name="parse_file" arity="3"/>
-      <name name="parse_file" arity="4"/>
       <fsummary>Preprocess and parse an Erlang source file</fsummary>
       <desc>
         <p>Preprocesses and parses an Erlang source file.
diff --git a/lib/stdlib/src/epp.erl b/lib/stdlib/src/epp.erl
index d958b0af2a..ccc14610d7 100644
--- a/lib/stdlib/src/epp.erl
+++ b/lib/stdlib/src/epp.erl
@@ -20,9 +20,9 @@
 
 %% An Erlang code preprocessor.
 
--export([open/2,open/3,open/4, open/5,close/1,format_error/1]).
+-export([open/2,open/3,open/5,close/1,format_error/1]).
 -export([scan_erl_form/1,parse_erl_form/1,macro_defs/1]).
--export([parse_file/1, parse_file/3, parse_file/4]).
+-export([parse_file/1, parse_file/3]).
 -export([interpret_file_attribute/1]).
 -export([normalize_typed_record_fields/1,restore_typed_record_fields/1]).
 
@@ -54,14 +54,12 @@
 
 %% open(FileName, IncludePath)
 %% open(FileName, IncludePath, PreDefMacros)
-%% open(FileName, StartLocation, IncludePath, PredefMacros)
 %% open(FileName, IoDevice, StartLocation, IncludePath, PreDefMacros)
 %% close(Epp)
 %% scan_erl_form(Epp)
 %% parse_erl_form(Epp)
 %% parse_file(Epp)
 %% parse_file(FileName, IncludePath, PreDefMacros)
-%% parse_file(FileName, StartLocation, IncludePath, PreDefMacros)
 %% macro_defs(Epp)
 
 -spec open(FileName, IncludePath) ->
@@ -83,20 +81,8 @@ open(Name, Path) ->
       ErrorDescriptor :: term().
 
 open(Name, Path, Pdm) ->
-    open(Name, 1, Path, Pdm).
-
--spec open(FileName, StartLocation, IncludePath, PredefMacros) ->
-	{'ok', Epp} | {'error', ErrorDescriptor} when
-      FileName :: file:name(),
-      StartLocation :: erl_scan:location(),
-      IncludePath :: [DirectoryName :: file:name()],
-      PredefMacros :: macros(),
-      Epp :: epp_handle(),
-      ErrorDescriptor :: term().
-
-open(Name, StartLocation, Path, Pdm) ->
     Self = self(),
-    Epp = spawn(fun() -> server(Self, Name, StartLocation, Path, Pdm) end),
+    Epp = spawn(fun() -> server(Self, Name, Path, Pdm) end),
     epp_request(Epp).
 
 open(Name, File, StartLocation, Path, Pdm) ->
@@ -192,21 +178,7 @@ format_error(E) -> file:format_error(E).
       OpenError :: file:posix() | badarg | system_limit.
 
 parse_file(Ifile, Path, Predefs) ->
-    parse_file(Ifile, 1, Path, Predefs).
-
--spec parse_file(FileName, StartLocation, IncludePath, PredefMacros) ->
-                {'ok', [Form]} | {error, OpenError} when
-      FileName :: file:name(),
-      StartLocation :: erl_scan:location(),
-      IncludePath :: [DirectoryName :: file:name()],
-      Form :: erl_parse:abstract_form() | {'error', ErrorInfo} | {'eof',Line},
-      PredefMacros :: macros(),
-      Line :: erl_scan:line(),
-      ErrorInfo :: erl_scan:error_info() | erl_parse:error_info(),
-      OpenError :: file:posix() | badarg | system_limit.
-
-parse_file(Ifile, StartLocation, Path, Predefs) ->
-    case open(Ifile, StartLocation, Path, Predefs) of
+    case open(Ifile, Path, Predefs) of
 	{ok,Epp} ->
 	    Forms = parse_file(Epp),
 	    close(Epp),
@@ -273,12 +245,14 @@ restore_typed_record_fields([{attribute,La,type,{{record,Record},Fields,[]}}|
 restore_typed_record_fields([Form|Forms]) ->
     [Form|restore_typed_record_fields(Forms)].
 
-%% server(StarterPid, FileName, Location, Path, PreDefMacros)
-server(Pid, Name, AtLocation, Path, Pdm) ->
+%% server(StarterPid, FileName, Path, PreDefMacros)
+
+server(Pid, Name, Path, Pdm) ->
     process_flag(trap_exit, true),
     case file:open(Name, [read]) of
 	{ok,File} ->
-	    init_server(Pid, Name, File, AtLocation, Path, Pdm, false);
+            Location = 1,
+	    init_server(Pid, Name, File, Location, Path, Pdm, false);
 	{error,E} ->
 	    epp_reply(Pid, {error,E})
     end.
diff --git a/lib/stdlib/src/erl_scan.erl b/lib/stdlib/src/erl_scan.erl
index be64b428b1..10b2ed2e49 100644
--- a/lib/stdlib/src/erl_scan.erl
+++ b/lib/stdlib/src/erl_scan.erl
@@ -55,7 +55,7 @@
          token_info/1,token_info/2,
          attributes_info/1,attributes_info/2,set_attribute/3]).
 
--export_type([error_info/0, line/0, location/0, tokens_result/0]).
+-export_type([error_info/0, line/0, tokens_result/0]).
 
 %%%
 %%% Defines and type definitions
-- 
cgit v1.2.3